Merge wxQT branch into the trunk.

This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/chartype.h

@@ -67,6 +67,23 @@
         }
     #endif /* Cygwin and C++ */
 
+    /* the current (as of Mar 2014) version of Android (up to api level 19) */
+    /* doesn't include some declarations (wscdup, wcslen, wcscasecmp, etc.) */
+    /* (moved out from __CYGWIN__ block) */
+    #if defined(__WXQT__) && !defined(wcsdup) && defined(__ANDROID__)
+        #ifdef __cplusplus
+            extern "C" {
+        #endif
+            extern wchar_t *wcsdup(const wchar_t *);
+            extern size_t wcslen (const wchar_t *);
+            extern size_t wcsnlen (const wchar_t *, size_t );
+            extern int wcscasecmp (const wchar_t *, const wchar_t *);
+            extern int wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
+        #ifdef __cplusplus
+            }
+        #endif
+    #endif /* Android */
+
 #elif defined(HAVE_WCSTR_H)
     /* old compilers have relevant declarations here */
     #include <wcstr.h>