Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.9.2-nestedtables.patch
Date: Sat, 25 Apr 2009 02:25:48
Message-Id: E1LxXaM-0007NQ-JB@stork.gentoo.org
1 dirtyepic 09/04/25 02:25:46
2
3 Added: wxGTK-2.8.9.2-nestedtables.patch
4 Log:
5 - Fix nested HTML tables (bug #264544, Ivan Trombley)
6 - Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied
7 Johansen)
8 (Portage version: 2.2_rc31/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch?rev=1.1&content-type=text/plain
15
16 Index: wxGTK-2.8.9.2-nestedtables.patch
17 ===================================================================
18 https://bugs.gentoo.org/show_bug.cgi?id=264544
19 http://trac.wxwidgets.org/ticket/10370
20
21 --- wxPython-src-2.8.9.2-orig/src/html/m_tables.cpp
22 +++ wxPython-src-2.8.9.2/src/html/m_tables.cpp
23 @@ -684,6 +684,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
24 {
25 wxHtmlTableCell *oldt = m_Table;
26
27 + wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
28 m_enclosingContainer = c = m_WParser->OpenContainer();
29
30 m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
31 @@ -722,6 +723,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
32 m_WParser->CloseContainer();
33
34 m_Table = oldt;
35 + m_enclosingContainer = oldEnclosing;
36
37 return true; // ParseInner() called
38 }