Update to 2.8.12

Changelog:
2.8.12:
-------

All:

- Fixed a bug in UNC path testing.
- Improved command line parser usage help.
- Fixed race condition bugs in wxCondition.
- Added wxT_2() for forward compatibility with wxWidgets 3. Use it in
  initialization of wxCmdLineEntryDesc struct elements and (very few) other
  places where wxT() is required currently but won't be allowed in v3.
- Fixed crash on exit caused by deleting old logger in wxLogChain dtor.

All (GUI):

- wxRTC: fixed style selection resetting after editing a style.
- wxRTC: can now edit line spacing in .1 increments from 1 to 2.
- wxRTC: fixed wrong line spacing and space after paragraph calculations.
- wxRTC: GetStyleMergedWithBase now detects loops.
- wxRTC: wxRichTextCtrl::ApplyStyle now applies a paragraph style at the
  cursor without needing a selection, and setting the default style now
  avoids duplicating character attributes in subsequently typed text when
  they exist in the paragraph style.
- wxRTC: fixed IsPositionVisible to scroll a position into view correctly.
- wxRTC: fixed a problem with paste resetting the content paragraph style.
- wxRTC: style list box now copes with names duplicated across style types.
  Also fixed wxRichTextStyleDefinition::GetStyleMergeWithBase similarly.
- wxRTC: fixed very poor performance for XML loading on wxGTK.
- Fixed error in generic tree control CalculatePositions.
- Added wxFD_FILE_MUST_EXIST to wxFileSelector function.
- Added wxDataViewCtrl Get/SetValueByRow functions for forward compatibility
  with 2.9.
- Right-clicking is now supported in any kind of wxAuiToolBar button.
- Fixed a bug in wxAcceleratorEntry::IsOk.
- wxGraphicsContext::DrawBitmap: x and y coordinates no longer affected by
  stretch factor.
- Fixed an assert in wxGrid on wxEVT_MOUSE_CAPTURE_LOST.
- Fixed bug in generic wxTreeCtrl where SelectItem toggles the selection if
  the item is already in the desired state.
- Fixed bug in wxSizer::Replace(size_t, wxSizerItem *) whereby SetContainingSizer
  is not called.
- Fixed compilation with libpng 1.5 and above.
- Removed ugly black (simple) border around wxHTML help window.

wxMSW:

- wxOwnerDrawnComboBox and wxComboCtrl with wxCB_READONLY window style now
  have more native-like focus indicator rendering.
- Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
  displayed when arrow key is pressed (without Alt).
- In some rare cases wxOwnerDrawnComboBox drop-down animation could display
  as garbage. This has now been greatly reduced (mcben).
- Fixed OLE date conversion bug.
- Added check for double window handle creation.
- Fixed WIN64 crash in wxStyledTextCtrl.
- Fixed Watcom compilation when omitting threads.
- Fixed wxFileName::IsFileReadable on Windows 98.
- Fixed bug whereby clicking anywhere inside wxListBox generates
  wxEVT_COMMAND_LISTBOX_SELECTED event. You need to set wxUSE_LISTBOX_SELECTION_FIX
  to 1 in include/wx/msw/listbox.h to enable this binary-incompatible fix.

wxGTK:

- Fix for --disable-radiobtn compilation.
- Fixed a bug on GTK+ only whereby wxGrid scrolls back to the previous edit position
  when another cell is edited.
- Fix for missing menubar problem under some window managers where menu bar height is
  reported as 0 when the menu hasn't fully realized yet. Now updates the height during
  idle time if it is 0, otherwise no menu is shown.
- Improved list control and tree control selection text theme compatibility by adding
  wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT colour index.
- wxComboCtrl and wxOwnerDrawnComboBox had wrong background colours under some
  themes (Marcin Wojdyr).
- Added thread-safe fixes to socket code.

wxUniv:

- Fixed assertion in tree control sample due to colour index not being supported.

8 files changed, 25 insertions, 189 deletions

diff --git a/x11/wxGTK28-contrib/Makefile b/x11/wxGTK28-contrib/Makefile
index 084842f066c..73a72ce2d5b 100644
--- a/x11/wxGTK28-contrib/Makefile
+++ b/x11/wxGTK28-contrib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/06/06 12:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/06/15 02:30:57 ryoon Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/wxGTK/wxGTK28-contrib/}
-PKGREVISION=	22
 COMMENT=	Contrib libraries for wxWidgets GTK
 
 USE_TOOLS+=		gmake
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile
index c608a622920..1efece57790 100644
--- a/x11/wxGTK28/Makefile
+++ b/x11/wxGTK28/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/06/15 02:30:57 ryoon Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
-PKGREVISION=	26
-
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK28/}
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common
index 5d10714e68e..c2b91a8ead0 100644
--- a/x11/wxGTK28/Makefile.common
+++ b/x11/wxGTK28/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.14 2012/10/29 05:06:56 asau Exp $
+# $NetBSD: Makefile.common,v 1.15 2013/06/15 02:30:57 ryoon Exp $
 #
 # used by x11/wxGTK28/Makefile
 # used by x11/wxGTK28-contrib/Makefile
 
-DISTNAME=		wxGTK-2.8.10
+DISTNAME=		wxGTK-2.8.12
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index d1c9df50ad0..b1715084d71 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.13 2012/03/12 10:39:52 fhajny Exp $
+$NetBSD: distinfo,v 1.14 2013/06/15 02:30:57 ryoon Exp $
 
-SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
-RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
-Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
-SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
-RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
-Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
-SHA1 (patch-aa) = a7a0d3b223e4e523a8903c89404fefc3de57a82c
+SHA1 (wxGTK-2.8.12-libtool.diff.bz2) = f2c9b8a06c08101325ffe09ad77f4800f7aa8730
+RMD160 (wxGTK-2.8.12-libtool.diff.bz2) = 05b763aa44a8e8c8ad565af2a188d7c6437f2133
+Size (wxGTK-2.8.12-libtool.diff.bz2) = 152004 bytes
+SHA1 (wxGTK-2.8.12.tar.bz2) = a8d31ef924ae49e97690646b13d5a2a7be7dda10
+RMD160 (wxGTK-2.8.12.tar.bz2) = c401f141ed9fb085c7b79a2f0db788ce6ae9309f
+Size (wxGTK-2.8.12.tar.bz2) = 9292767 bytes
+SHA1 (patch-aa) = ad2fcc73ffe0db67cb9ef5fe87fb1248f7b7675c
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
-SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
-SHA1 (patch-ba) = a715fe740cdd17428527b25e546cd1f8873c2d37
-SHA1 (patch-bb) = 27855267bd13a1db65cafc96eaba1ef7f71dc65f
+SHA1 (patch-ad) = b9fcf183ca9a53c696c75d526b82e55bc7a05f9f
+SHA1 (patch-ba) = 12a792ef6a82b136b24a5f0b5136c97779c96fc2
+SHA1 (patch-bb) = 25316b4c542ffc91e8a2ca6bfedbaac2d7fcebce
 SHA1 (patch-ca) = 7da457e1dbafb42766aa87c1ca9baca675e211ed
 SHA1 (patch-cb) = 8e3ca3df50ef678656787201317a2d2b385c861e
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa
index 59c4a85865c..a2b5dd41f4c 100644
--- a/x11/wxGTK28/patches/patch-aa
+++ b/x11/wxGTK28/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
+$NetBSD: patch-aa,v 1.6 2013/06/15 02:30:57 ryoon Exp $
 
---- configure.orig	2009-03-06 12:17:38.000000000 +0000
+--- configure.orig	2011-03-22 12:16:57.000000000 +0000
 +++ configure
 @@ -1962,7 +1962,7 @@ _ACEOF
  
@@ -51,60 +51,7 @@ $NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
  
  if test "$build" != "$host" -a "$GCC" = yes; then
                      if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
-@@ -26379,9 +26381,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
- 
- 
-             if test "$ac_cv_header_png_h" = "yes"; then
--                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -26399,11 +26401,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--png_check_sig ();
-+png_sig_cmp ();
-   ;
-   return 0;
- }
-@@ -26429,20 +26431,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_png_png_check_sig=yes
-+  ac_cv_lib_png_png_sig_cmp=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_png_png_check_sig=no
-+ac_cv_lib_png_png_sig_cmp=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
-   PNG_LINK=" -lpng -lz"
- fi
- 
-@@ -39478,6 +39480,9 @@ echo "$as_me: WARNING: BeOS threads are 
+@@ -39590,6 +39592,9 @@ echo "$as_me: WARNING: BeOS threads are 
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
@@ -114,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
            *-*-freebsd*)
                                                  THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                  ;;
-@@ -39611,7 +39616,7 @@ echo $ECHO_N "checking if more special f
+@@ -39723,7 +39728,7 @@ echo $ECHO_N "checking if more special f
                                                                                                                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                  flag="-D_THREAD_SAFE"
                  ;;
@@ -123,7 +70,7 @@ $NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
                  flag="-D_THREAD_SAFE"
                  ;;
              *-hp-hpux* )
-@@ -48532,7 +48537,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+@@ -48648,7 +48653,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
  
@@ -132,7 +79,7 @@ $NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -49099,6 +49104,7 @@ EOF
+@@ -49215,6 +49220,7 @@ EOF
  
        powerpc-apple-macos* | \
        *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
@@ -140,7 +87,7 @@ $NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
        *-*-mirbsd* | \
        *-*-sunos4* | \
        *-*-osf* | \
-@@ -49142,7 +49148,7 @@ echo "$as_me: error: unknown system type
+@@ -49258,7 +49264,7 @@ echo "$as_me: error: unknown system type
  
      case "${BAKEFILE_HOST}" in
        *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
diff --git a/x11/wxGTK28/patches/patch-ad b/x11/wxGTK28/patches/patch-ad
index d4d9174191e..36826a2de35 100644
--- a/x11/wxGTK28/patches/patch-ad
+++ b/x11/wxGTK28/patches/patch-ad
@@ -1,22 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2009/10/23 12:26:13 plunky Exp $
+$NetBSD: patch-ad,v 1.2 2013/06/15 02:30:57 ryoon Exp $
 
 avoid conflicts with GSocket in glib >= 2.21 as per
 
 	http://trac.wxwidgets.org/ticket/10883
 
---- src/gtk/gsockgtk.cpp.orig	2009-10-23 11:59:23.000000000 +0100
-+++ src/gtk/gsockgtk.cpp	2009-10-23 11:59:51.000000000 +0100
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
- 
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
diff --git a/x11/wxGTK28/patches/patch-ba b/x11/wxGTK28/patches/patch-ba
index fe3aa5e32cc..d2e2a7d0ed8 100644
--- a/x11/wxGTK28/patches/patch-ba
+++ b/x11/wxGTK28/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.4 2011/01/24 15:34:31 wiz Exp $
+$NetBSD: patch-ba,v 1.5 2013/06/15 02:30:57 ryoon Exp $
 
 deal with CVE-2009-2369. (chunks 2 + 3)
 
@@ -6,62 +6,3 @@ Fix build with png-1.5. (chunks 1 + 4)
 http://trac.wxwidgets.org/ticket/12896 for first one, other
 one already fixed in SVN head.
 
---- src/common/imagpng.cpp.orig	2009-03-06 12:17:40.000000000 +0000
-+++ src/common/imagpng.cpp
-@@ -529,7 +529,7 @@ wxPNGHandler::LoadFile(wxImage *image,
-     png_structp png_ptr = png_create_read_struct
-                           (
-                             PNG_LIBPNG_VER_STRING,
--                            (voidp) NULL,
-+                            NULL,
-                             wx_png_error,
-                             wx_png_warning
-                           );
-@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
-@@ -588,16 +586,20 @@ wxPNGHandler::LoadFile(wxImage *image,
- #if wxUSE_PALETTE
-     if (color_type == PNG_COLOR_TYPE_PALETTE)
-     {
--        const size_t ncolors = info_ptr->num_palette;
-+        png_colorp palette;
-+        int ncolors;
-+
-+        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
-+
-         unsigned char* r = new unsigned char[ncolors];
-         unsigned char* g = new unsigned char[ncolors];
-         unsigned char* b = new unsigned char[ncolors];
- 
--        for (size_t j = 0; j < ncolors; j++)
-+        for (int j = 0; j < ncolors; j++)
-         {
--            r[j] = info_ptr->palette[j].red;
--            g[j] = info_ptr->palette[j].green;
--            b[j] = info_ptr->palette[j].blue;
-+            r[j] = palette[j].red;
-+            g[j] = palette[j].green;
-+            b[j] = palette[j].blue;
-         }
- 
-         image->SetPalette(wxPalette(ncolors, r, g, b));
diff --git a/x11/wxGTK28/patches/patch-bb b/x11/wxGTK28/patches/patch-bb
index 8506212d99e..26aa85910eb 100644
--- a/x11/wxGTK28/patches/patch-bb
+++ b/x11/wxGTK28/patches/patch-bb
@@ -1,37 +1,4 @@
-$NetBSD: patch-bb,v 1.2 2010/02/16 17:38:14 taca Exp $
+$NetBSD: patch-bb,v 1.3 2013/06/15 02:30:57 ryoon Exp $
 
 deal with CVE-2009-2369.
 
---- src/common/imagtiff.cpp.orig	2009-03-06 13:17:40.000000000 +0100
-+++ src/common/imagtiff.cpp
-@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+	if ( verbose )
-+	    wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+	TIFFClose(tif);
-+
-+	return false;
-+    }
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
- 
-     if (!raster)
-     {