[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master bca897c 7/8: Add new wx patch; remove old one
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master bca897c 7/8: Add new wx patch; remove old ones (VZ) |
|
Date: |
Thu, 18 May 2017 22:45:45 -0400 (EDT) |
branch: master
commit bca897c546153097e70fa35edbe6e372853a503f
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Add new wx patch; remove old ones (VZ)
See:
http://lists.nongnu.org/archive/html/lmi/2017-05/msg00017.html
The new patch would have been named
wx-41045df7ea5f93e4c07c1bd846d7127a372705bd.patch
except for the changes in the last few commits.
---
wx-2.8.10.patch | 14 ----
wx-2.8.6.patch | 37 ---------
wx-2.8.7.patch | 136 --------------------------------
wx-2.9.3.patch | 78 -------------------
wx-2.9.5.patch | 227 ------------------------------------------------------
wx-3.0.0.patch | 47 -----------
wx-3.1.0-p1.patch | 14 ++++
7 files changed, 14 insertions(+), 539 deletions(-)
diff --git a/wx-2.8.10.patch b/wx-2.8.10.patch
deleted file mode 100644
index cf59034..0000000
--- a/wx-2.8.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --recursive --unified=3 original/wxWidgets-2.8.10/include/wx/thread.h
modified/wxWidgets-2.8.10/include/wx/thread.h
---- original/wxWidgets-2.8.10/include/wx/thread.h 2009-03-06
12:10:52.000000000 +0000
-+++ modified/wxWidgets-2.8.10/include/wx/thread.h 2009-04-25
02:35:48.000000000 +0000
-@@ -688,8 +688,8 @@
- #else // !wxUSE_THREADS
-
- // no thread support
--inline void WXDLLIMPEXP_BASE wxMutexGuiEnter() { }
--inline void WXDLLIMPEXP_BASE wxMutexGuiLeave() { }
-+inline void wxMutexGuiEnter() { }
-+inline void wxMutexGuiLeave() { }
-
- // macros for entering/leaving critical sections which may be used without
- // having to take them inside "#if wxUSE_THREADS"
diff --git a/wx-2.8.6.patch b/wx-2.8.6.patch
deleted file mode 100644
index b71670a..0000000
--- a/wx-2.8.6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --recursive --unified=3 original/wxWidgets-2.8.6/src/msw/textctrl.cpp
modified/wxWidgets-2.8.6/src/msw/textctrl.cpp
---- original/wxWidgets-2.8.6/src/msw/textctrl.cpp 2007-09-25
08:52:06.000000000 +0000
-+++ modified/wxWidgets-2.8.6/src/msw/textctrl.cpp 2008-02-04
00:48:03.802769300 +0000
-@@ -1964,6 +1964,19 @@
-
- WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM
lParam)
- {
-+ // we must handle clipboard events before calling MSWWindowProc, otherwise
-+ // the event would be handled twice if there's a handler for it in user
-+ // code:
-+ switch ( nMsg )
-+ {
-+ case WM_CUT:
-+ case WM_COPY:
-+ case WM_PASTE:
-+ if ( HandleClipboardEvent(nMsg) )
-+ return 0;
-+ break;
-+ }
-+
- WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
-
- switch ( nMsg )
-@@ -2006,13 +2019,6 @@
- }
- }
- break;
--
-- case WM_CUT:
-- case WM_COPY:
-- case WM_PASTE:
-- if ( HandleClipboardEvent(nMsg) )
-- lRc = 0;
-- break;
- }
-
- return lRc;
diff --git a/wx-2.8.7.patch b/wx-2.8.7.patch
deleted file mode 100644
index defd8b3..0000000
--- a/wx-2.8.7.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --recursive --unified=3 original/wxWidgets-2.8.7/src/common/cshelp.cpp
modified/wxWidgets-2.8.7/src/common/cshelp.cpp
---- original/wxWidgets-2.8.7/src/common/cshelp.cpp 2007-11-21
12:41:57.000000000 +0000
-+++ modified/wxWidgets-2.8.7/src/common/cshelp.cpp 2008-03-05
18:05:30.259306600 +0000
-@@ -384,6 +384,11 @@
- bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
- {
- #if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
-+#if wxUSE_MS_HTML_HELP
-+ // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it
-+ const wxPoint posTooltip = m_helptextAtPoint;
-+#endif // wxUSE_MS_HTML_HELP
-+
- const wxString text = GetHelpTextMaybeAtPoint(window);
-
- if ( !text.empty() )
-@@ -393,7 +398,7 @@
- if ( !wxCHMHelpController::ShowContextHelpPopup
- (
- text,
-- wxGetMousePosition(),
-+ posTooltip,
- (wxWindow *)window
- ) )
- #endif // wxUSE_MS_HTML_HELP
-diff --recursive --unified=3 original/wxWidgets-2.8.7/src/common/wincmn.cpp
modified/wxWidgets-2.8.7/src/common/wincmn.cpp
---- original/wxWidgets-2.8.7/src/common/wincmn.cpp 2007-11-21
12:41:57.000000000 +0000
-+++ modified/wxWidgets-2.8.7/src/common/wincmn.cpp 2008-03-05
18:05:29.728036200 +0000
-@@ -392,6 +392,14 @@
- #if wxUSE_ACCESSIBILITY
- delete m_accessible;
- #endif
-+
-+#if wxUSE_HELP
-+ // NB: this has to be called unconditionally, because we don't
-+ // know whether this window has associated help text or not
-+ wxHelpProvider *helpProvider = wxHelpProvider::Get();
-+ if ( helpProvider )
-+ helpProvider->RemoveHelp(this);
-+#endif
- }
-
- void wxWindowBase::SendDestroyEvent()
-@@ -1635,7 +1643,29 @@
- wxHelpProvider *helpProvider = wxHelpProvider::Get();
- if ( helpProvider )
- {
-- if ( helpProvider->ShowHelpAtPoint(this, event.GetPosition(),
event.GetOrigin()) )
-+ wxPoint pos = event.GetPosition();
-+ const wxHelpEvent::Origin origin = event.GetOrigin();
-+ if ( origin == wxHelpEvent::Origin_Keyboard )
-+ {
-+ // if the help event was generated from keyboard it shouldn't
-+ // appear at the mouse position (which is still the only position
-+ // associated with help event) if the mouse is far away, although
-+ // we still do use the mouse position if it's over the window
-+ // because we suppose the user looks approximately at the mouse
-+ // already and so it would be more convenient than showing tooltip
-+ // at some arbitrary position which can be quite far from it
-+ const wxRect rectClient = GetClientRect();
-+ if ( !rectClient.Contains(ScreenToClient(pos)) )
-+ {
-+ // position help slightly under and to the right of this
window
-+ pos = ClientToScreen(wxPoint(
-+ 2*GetCharWidth(),
-+ rectClient.height + GetCharHeight()
-+ ));
-+ }
-+ }
-+
-+ if ( helpProvider->ShowHelpAtPoint(this, pos, origin) )
- {
- // skip the event.Skip() below
- return;
-diff --recursive --unified=3 original/wxWidgets-2.8.7/src/msw/spinctrl.cpp
modified/wxWidgets-2.8.7/src/msw/spinctrl.cpp
---- original/wxWidgets-2.8.7/src/msw/spinctrl.cpp 2007-11-21
12:42:46.000000000 +0000
-+++ modified/wxWidgets-2.8.7/src/msw/spinctrl.cpp 2008-03-05
18:05:30.181178600 +0000
-@@ -147,8 +147,7 @@
- {
- wxSpinCtrl *spin = (wxSpinCtrl *)wxGetWindowUserData(hwnd);
-
-- // forward some messages (the key and focus ones only so far) to
-- // the spin ctrl
-+ // forward some messages (mostly the key and focus ones) to the spin ctrl
- switch ( message )
- {
- case WM_SETFOCUS:
-@@ -163,6 +162,12 @@
- case WM_DEADCHAR:
- case WM_KEYUP:
- case WM_KEYDOWN:
-+#ifdef WM_HELP
-+ // we need to forward WM_HELP too to ensure that the context help
-+ // associated with wxSpinCtrl is shown when the text control part of
it
-+ // is clicked with the "?" cursor
-+ case WM_HELP:
-+#endif
- spin->MSWWindowProc(message, wParam, lParam);
-
- // The control may have been deleted at this point, so check.
-diff --recursive --unified=3 original/wxWidgets-2.8.7/src/msw/textctrl.cpp
modified/wxWidgets-2.8.7/src/msw/textctrl.cpp
---- original/wxWidgets-2.8.7/src/msw/textctrl.cpp 2007-11-21
12:42:46.000000000 +0000
-+++ modified/wxWidgets-2.8.7/src/msw/textctrl.cpp 2008-03-05
18:05:29.399898600 +0000
-@@ -1964,6 +1964,19 @@
-
- WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM
lParam)
- {
-+ // we must handle clipboard events before calling MSWWindowProc, otherwise
-+ // the event would be handled twice if there's a handler for it in user
-+ // code:
-+ switch ( nMsg )
-+ {
-+ case WM_CUT:
-+ case WM_COPY:
-+ case WM_PASTE:
-+ if ( HandleClipboardEvent(nMsg) )
-+ return 0;
-+ break;
-+ }
-+
- WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
-
- switch ( nMsg )
-@@ -2006,13 +2019,6 @@
- }
- }
- break;
--
-- case WM_CUT:
-- case WM_COPY:
-- case WM_PASTE:
-- if ( HandleClipboardEvent(nMsg) )
-- lRc = 0;
-- break;
- }
-
- return lRc;
diff --git a/wx-2.9.3.patch b/wx-2.9.3.patch
deleted file mode 100644
index 82468a8..0000000
--- a/wx-2.9.3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: wxWidgets-2.9.3/src/common/stopwatch.cpp
-===================================================================
---- old/wxWidgets-2.9.3/src/common/stopwatch.cpp (revision 69921)
-+++ new/wxWidgets-2.9.3/src/common/stopwatch.cpp (revision 70012)
-@@ -38,4 +38,5 @@
- #endif
- #include "wx/log.h"
-+ #include "wx/thread.h"
- #endif //WX_PRECOMP
-
-@@ -65,5 +66,5 @@
- }
-
-- wxCriticalSection cs;
-+ wxCRIT_SECT_DECLARE_MEMBER(cs);
- LARGE_INTEGER freq;
- bool init;
-@@ -83,5 +84,5 @@
- if ( !gs_perfCounter.init )
- {
-- wxCriticalSectionLocker lock(gs_perfCounter.cs);
-+ wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
- ::QueryPerformanceFrequency(&gs_perfCounter.freq);
-
-Index: old/wxWidgets-2.9.3/src/generic/datavgen.cpp
-===================================================================
---- old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70201)
-+++ old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70308)
-@@ -623,4 +623,7 @@
- void ChangeCurrentRow( unsigned int row );
- bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward);
-+
-+ wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; }
-+ void ClearCurrentColumn() { m_currentCol = NULL; }
-
- bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
-@@ -4743,4 +4746,8 @@
- m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
- m_cols.Erase(ret);
-+
-+ if ( m_clientArea->GetCurrentColumn() == column )
-+ m_clientArea->ClearCurrentColumn();
-+
- OnColumnsCountChanged();
-
-@@ -4753,5 +4760,9 @@
- m_cols.Clear();
- m_colsBestWidths.clear();
-+
-+ m_clientArea->ClearCurrentColumn();
-+
- OnColumnsCountChanged();
-+
- return true;
- }
-Index: old/wxWidgets-2.9.3/src/generic/datavgen.cpp
-===================================================================
---- old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70308)
-+++ old/wxWidgets-2.9.3/src/generic/datavgen.cpp (revision 70318)
-@@ -3528,4 +3528,5 @@
- {
- case WXK_RETURN:
-+ if ( !event.HasModifiers() )
- {
- // Enter activates the item, i.e. sends
wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to
-@@ -3547,4 +3548,5 @@
-
- case WXK_SPACE:
-+ if ( !event.HasModifiers() )
- {
- // Space toggles activatable items or -- if not activatable --
-@@ -3576,4 +3578,5 @@
-
- case WXK_F2:
-+ if ( !event.HasModifiers() )
- {
- if( !m_selection.empty() )
-
diff --git a/wx-2.9.5.patch b/wx-2.9.5.patch
deleted file mode 100644
index bef09ca..0000000
--- a/wx-2.9.5.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/include/wx/containr.h
modified/wxWidgets-2.9.5/include/wx/containr.h
---- original/wxWidgets-2.9.5/include/wx/containr.h 2013-07-16
15:47:14.000000000 +0000
-+++ modified/wxWidgets-2.9.5/include/wx/containr.h 2013-07-23
16:49:32.671549600 +0000
-@@ -62,18 +62,26 @@
-
- // This can be called by the window to indicate that it never wants to
have
- // the focus for itself.
-- void DisableSelfFocus() { m_acceptsFocusSelf = false; }
-+ void DisableSelfFocus()
-+ { m_acceptsFocusSelf = false; UpdateParentCanFocus(); }
-+
-+ // This can be called to undo the effect of a previous DisableSelfFocus()
-+ // (otherwise calling it is not necessary as the window does accept focus
-+ // by default).
-+ void EnableSelfFocus()
-+ { m_acceptsFocusSelf = true; UpdateParentCanFocus(); }
-
- // should be called from SetFocus(), returns false if we did nothing with
- // the focus and the default processing should take place
- bool DoSetFocus();
-
- // returns whether we should accept focus ourselves or not
-- bool AcceptsFocus() const { return m_acceptsFocusSelf; }
-+ bool AcceptsFocus() const;
-
- // Returns whether we or one of our children accepts focus.
- bool AcceptsFocusRecursively() const
-- { return m_acceptsFocusSelf || m_acceptsFocusChildren; }
-+ { return AcceptsFocus() ||
-+ (m_acceptsFocusChildren && HasAnyChildrenAcceptingFocus()); }
-
- // We accept focus from keyboard if we accept it at all.
- bool AcceptsFocusFromKeyboard() const { return AcceptsFocusRecursively();
}
-@@ -90,6 +98,10 @@
- // return true if we have any children accepting focus
- bool HasAnyFocusableChildren() const;
-
-+ // return true if we have any children that do accept focus right now
-+ bool HasAnyChildrenAcceptingFocus() const;
-+
-+
- // the parent window we manage the children for
- wxWindow *m_winParent;
-
-@@ -97,6 +109,9 @@
- wxWindow *m_winLastFocused;
-
- private:
-+ // Update the window status to reflect whether it is getting focus or not.
-+ void UpdateParentCanFocus();
-+
- // Indicates whether the associated window can ever have focus itself.
- //
- // Usually this is the case, e.g. a wxPanel can be used either as a
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/include/wx/cpp.h
modified/wxWidgets-2.9.5/include/wx/cpp.h
---- original/wxWidgets-2.9.5/include/wx/cpp.h 2013-07-16 15:47:14.000000000
+0000
-+++ modified/wxWidgets-2.9.5/include/wx/cpp.h 2013-07-20 00:40:10.000000000
+0000
-@@ -144,6 +144,13 @@
-
-
- #ifdef HAVE_VARIADIC_MACROS
-+/* There is no other way to suppress the
-+ * "anonymous variadic macros were introduced in C99"
-+ * diagnostic with gcc-3.x .
-+ */
-+# if defined(__GNUC__) && __GNUC__ == 3
-+# pragma GCC system_header
-+# endif /* gcc-3.x */
- /*
- wxCALL_FOR_EACH(what, ...) calls the macro from its first argument,
what(pos, x),
- for every remaining argument 'x', with 'pos' being its 1-based index in
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/include/wx/msw/radiobox.h
modified/wxWidgets-2.9.5/include/wx/msw/radiobox.h
---- original/wxWidgets-2.9.5/include/wx/msw/radiobox.h 2013-07-16
15:47:14.000000000 +0000
-+++ modified/wxWidgets-2.9.5/include/wx/msw/radiobox.h 2013-07-23
14:13:07.545848100 +0000
-@@ -97,6 +97,7 @@
- // override some base class methods
- virtual bool Show(bool show = true);
- virtual bool Enable(bool enable = true);
-+ virtual bool CanBeFocused() const;
- virtual void SetFocus();
- virtual bool SetFont(const wxFont& font);
- virtual bool ContainsHWND(WXHWND hWnd) const;
-@@ -113,10 +114,6 @@
-
- virtual bool Reparent(wxWindowBase *newParent);
-
-- // we inherit a version always returning false from wxStaticBox, override
-- // it to behave normally
-- virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
--
- // returns true if the platform should explicitly apply a theme border
- virtual bool CanApplyThemeBorder() const { return false; }
-
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/include/wx/window.h
modified/wxWidgets-2.9.5/include/wx/window.h
---- original/wxWidgets-2.9.5/include/wx/window.h 2013-07-16
15:47:14.000000000 +0000
-+++ modified/wxWidgets-2.9.5/include/wx/window.h 2013-07-23
14:13:54.202993900 +0000
-@@ -724,8 +724,13 @@
- virtual bool AcceptsFocusFromKeyboard() const { return AcceptsFocus(); }
-
-
-- // this is mostly a helper for the various functions using it below
-- bool CanBeFocused() const { return IsShown() && IsEnabled(); }
-+ // Can this window be focused right now, in its current state? This
-+ // shouldn't be called at all if AcceptsFocus() returns false.
-+ //
-+ // It is a convenient helper for the various functions using it below
-+ // but also a hook allowing to override the default logic for some
rare
-+ // cases (currently just wxRadioBox in wxMSW) when it's inappropriate.
-+ virtual bool CanBeFocused() const { return IsShown() && IsEnabled(); }
-
- // can this window itself have focus?
- bool IsFocusable() const { return AcceptsFocus() && CanBeFocused(); }
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/src/common/containr.cpp
modified/wxWidgets-2.9.5/src/common/containr.cpp
---- original/wxWidgets-2.9.5/src/common/containr.cpp 2013-07-16
15:47:14.000000000 +0000
-+++ modified/wxWidgets-2.9.5/src/common/containr.cpp 2013-07-23
16:49:41.312395800 +0000
-@@ -47,6 +47,14 @@
- // wxControlContainerBase
- //
----------------------------------------------------------------------------
-
-+void wxControlContainerBase::UpdateParentCanFocus()
-+{
-+ // In the ports where it does something non trivial, the parent window
-+ // should only be focusable if it doesn't have any focusable children
-+ // (e.g. native focus handling in wxGTK totally breaks down otherwise).
-+ m_winParent->SetCanFocus(m_acceptsFocusSelf && !m_acceptsFocusChildren);
-+}
-+
- bool wxControlContainerBase::UpdateCanFocusChildren()
- {
- const bool acceptsFocusChildren = HasAnyFocusableChildren();
-@@ -54,10 +62,7 @@
- {
- m_acceptsFocusChildren = acceptsFocusChildren;
-
-- // In the ports where it does something non trivial, the parent window
-- // should only be focusable if it doesn't have any focusable children
-- // (e.g. native focus handling in wxGTK totally breaks down
otherwise).
-- m_winParent->SetCanFocus(m_acceptsFocusSelf &&
!m_acceptsFocusChildren);
-+ UpdateParentCanFocus();
- }
-
- return m_acceptsFocusChildren;
-@@ -76,6 +81,30 @@
- if ( !m_winParent->IsClientAreaChild(child) )
- continue;
-
-+ // Here we check whether the child can accept the focus at all, as we
-+ // want to try focusing it later even if it can't accept it right now.
-+ if ( child->AcceptsFocusRecursively() )
-+ return true;
-+ }
-+
-+ return false;
-+}
-+
-+bool wxControlContainerBase::HasAnyChildrenAcceptingFocus() const
-+{
-+ const wxWindowList& children = m_winParent->GetChildren();
-+ for ( wxWindowList::const_iterator i = children.begin(),
-+ end = children.end();
-+ i != end;
-+ ++i )
-+ {
-+ const wxWindow * const child = *i;
-+
-+ if ( !m_winParent->IsClientAreaChild(child) )
-+ continue;
-+
-+ // Here we check if the child accepts focus right now as we need to
-+ // know if we can give the focus to it or not.
- if ( child->CanAcceptFocus() )
- return true;
- }
-@@ -124,6 +153,11 @@
- return ret;
- }
-
-+bool wxControlContainerBase::AcceptsFocus() const
-+{
-+ return m_acceptsFocusSelf && m_winParent->CanBeFocused();
-+}
-+
- bool wxControlContainerBase::SetFocusToChild()
- {
- return wxSetFocusToChild(m_winParent, &m_winLastFocused);
-diff -x 'xml*' --recursive '--unified=3'
original/wxWidgets-2.9.5/src/msw/radiobox.cpp
modified/wxWidgets-2.9.5/src/msw/radiobox.cpp
---- original/wxWidgets-2.9.5/src/msw/radiobox.cpp 2013-07-16
15:47:14.000000000 +0000
-+++ modified/wxWidgets-2.9.5/src/msw/radiobox.cpp 2013-07-23
14:14:18.609712500 +0000
-@@ -256,6 +256,12 @@
- const wxSize actualSize = GetSize();
- PositionAllButtons(pos.x, pos.y, actualSize.x, actualSize.y);
-
-+ // The base wxStaticBox class never accepts focus, but we do because
giving
-+ // focus to a wxRadioBox actually gives it to one of its buttons, which
are
-+ // not visible at wx level and hence are not taken into account by the
-+ // logic in wxControlContainer code.
-+ m_container.EnableSelfFocus();
-+
- return true;
- }
-
-@@ -438,6 +444,25 @@
- }
- }
-
-+bool wxRadioBox::CanBeFocused() const
-+{
-+ // If the control itself is hidden or disabled, no need to check anything
-+ // else.
-+ if ( !wxStaticBox::CanBeFocused() )
-+ return false;
-+
-+ // Otherwise, check if we have any buttons that can be focused.
-+ for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
-+ {
-+ if ( IsItemEnabled(item) && IsItemShown(item) )
-+ return true;
-+ }
-+
-+ // We didn't find any items that can accept focus, so neither can we as a
-+ // whole accept it.
-+ return false;
-+}
-+
- // Enable a specific button
- bool wxRadioBox::Enable(unsigned int item, bool enable)
- {
diff --git a/wx-3.0.0.patch b/wx-3.0.0.patch
deleted file mode 100644
index fc09600..0000000
--- a/wx-3.0.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --recursive '--unified=3' original/wxWidgets-3.0.0/Makefile.in
modified/wxWidgets-3.0.0/Makefile.in
---- original/wxWidgets-3.0.0/Makefile.in 2013-11-11 13:10:40.000000000
+0000
-+++ modified/wxWidgets-3.0.0/Makefile.in 2014-03-13 20:22:04.437923700
+0000
-@@ -4154,6 +4154,7 @@
- wx/statbox.h \
- wx/stattext.h \
- wx/statusbr.h \
-+ wx/testing.h \
- wx/textcompleter.h \
- wx/textctrl.h \
- wx/textdlg.h \
-diff --recursive '--unified=3' original/wxWidgets-3.0.0/include/wx/cpp.h
modified/wxWidgets-3.0.0/include/wx/cpp.h
---- original/wxWidgets-3.0.0/include/wx/cpp.h 2013-11-11 13:10:40.000000000
+0000
-+++ modified/wxWidgets-3.0.0/include/wx/cpp.h 2014-03-11 20:08:58.000000000
+0000
-@@ -143,6 +143,14 @@
-
-
- #ifdef HAVE_VARIADIC_MACROS
-+/* There is no other way to suppress the
-+ * "anonymous variadic macros were introduced in C99"
-+ * diagnostic with gcc-3.x . See:
-+ * http://lists.nongnu.org/archive/html/lmi/2013-07/msg00002.html
-+ */
-+# if defined(__GNUC__) && __GNUC__ == 3
-+# pragma GCC system_header
-+# endif /* gcc-3.x */
- /*
- wxCALL_FOR_EACH(what, ...) calls the macro from its first argument,
what(pos, x),
- for every remaining argument 'x', with 'pos' being its 1-based index in
-diff --recursive '--unified=3' original/wxWidgets-3.0.0/include/wx/testing.h
modified/wxWidgets-3.0.0/include/wx/testing.h
---- original/wxWidgets-3.0.0/include/wx/testing.h 2013-11-11
13:10:40.000000000 +0000
-+++ modified/wxWidgets-3.0.0/include/wx/testing.h 2014-03-13
21:37:54.000000000 +0000
-@@ -337,6 +337,14 @@
- method.
- */
- #ifdef HAVE_VARIADIC_MACROS
-+/* There is no other way to suppress the
-+ * "anonymous variadic macros were introduced in C99"
-+ * diagnostic with gcc-3.x . See:
-+ * http://lists.nongnu.org/archive/html/lmi/2013-07/msg00002.html
-+ */
-+# if defined(__GNUC__) && __GNUC__ == 3
-+# pragma GCC system_header
-+# endif /* gcc-3.x */
- #define wxTEST_DIALOG(codeToRun, ...)
\
- {
\
- wxTEST_DIALOG_HOOK_CLASS wx_hook;
\
diff --git a/wx-3.1.0-p1.patch b/wx-3.1.0-p1.patch
new file mode 100644
index 0000000..a0b96e1
--- /dev/null
+++ b/wx-3.1.0-p1.patch
@@ -0,0 +1,14 @@
+diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
+index ea0f28e..8c50bfe 100644
+--- a/src/msw/spinctrl.cpp
++++ b/src/msw/spinctrl.cpp
+@@ -319,7 +319,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
+
+
+ // create the spin button
+- if ( !wxSpinButton::Create(parent, id, wxPoint(0, 0), wxSize(0, 0),
style, name) )
++ if ( !wxSpinButton::Create(parent, id, pos, wxSize(0, 0), style, name) )
+ {
+ return false;
+ }
+
- [lmi-commits] [lmi] master updated (dc58a57 -> df34159), Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 65e02fd 2/8: Make wx build directory at a more appropriate time, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master d93fdce 6/8: Halt on wx patch failure, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master d6b7693 3/8: Move wget flags into $(WGETFLAGS), Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 296dad1 5/8: Base wx patches on source directory, not its parent, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master df34159 8/8: Remove an unnecessary makefile variable, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 8717778 1/8: Update lists of handy commands, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 53e1802 4/8: Use a gainlier name for source directory, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master bca897c 7/8: Add new wx patch; remove old ones (VZ),
Greg Chicares <=