head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.2 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.1.0.28 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.26 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.24 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.22 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.20 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.18 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.16 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.14 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.12 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.10 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.8 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.6 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.4 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.2 pkgsrc-2009Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2013.06.15.05.47.12; author wiz; state dead; branches; next 1.2; commitid Kgjo7thnQyaNLFTw; 1.2 date 2013.06.15.02.30.57; author ryoon; state Exp; branches; next 1.1; commitid NruEb5ZnvodrGETw; 1.1 date 2009.10.23.12.26.13; author plunky; state Exp; branches; next ; desc @@ 1.3 log @Remove three empty patches. @ text @$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 @ 1.2 log @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. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2009/10/23 12:26:13 plunky Exp $ @ 1.1 log @avoid conflicts with GSocket in glib >= 2.21 as per http://trac.wxwidgets.org/ticket/10883 (fixes build) @ text @d1 1 a1 1 $NetBSD: patch-ad$ a6 16 --- 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 #include +// 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 #include +#undef GSocket #include "wx/gsocket.h" #include "wx/unix/gsockunx.h" @