Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a problem with HTML list generation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-11-28 12:20:12 +00:00
parent e6930eead4
commit a68919467a
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
docs/changes.txt
View File

@@ -98,9 +98,12 @@ All:
All (GUI): All (GUI):
- Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer).
- Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example - Fixed wxRichTextCtrl input that uses Alt on Mac OS X, for example
Polish Pro input. Polish Pro input.
Also fixed a bug whereby e.g. Croatian keys didn't work, by moving more code
to key down handler.
- Fixed a problem with HTML list generation for wxRichTextCtrl.
- Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer).
- Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after - Fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after
single-cell paragraphs. single-cell paragraphs.
- Fixed wxHTML's line breaks handling in <pre> blocks broken in 2.8.8 (#10120). - Fixed wxHTML's line breaks handling in <pre> blocks broken in 2.8.8 (#10120).
@@ -915,7 +918,7 @@ All (GUI):
- wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls. - wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls.
- Added wxTopLevelWindow::SetTransparent and CanSetTransparent, with - Added wxTopLevelWindow::SetTransparent and CanSetTransparent, with
implementations (so far) for wxMSW and wxMac. implementations (so far) for wxMSW and wxMac.
- Allow customizing individual grid lines appearance (S<EFBFBD>ren Lassen). - Allow customizing individual grid lines appearance (Sren Lassen).
- Fixed middle click events generation in generic wxTreeCtrl (Olly Betts). - Fixed middle click events generation in generic wxTreeCtrl (Olly Betts).
- Added wxEVT_MOUSE_CAPTURE_LOST event that must be handled by all windows - Added wxEVT_MOUSE_CAPTURE_LOST event that must be handled by all windows
that CaptureMouse() is called on. that CaptureMouse() is called on.
@@ -1078,7 +1081,7 @@ wxX11:
- Invisible text problem fixed. - Invisible text problem fixed.
- Bitmap clipping with masks and scaling improved. - Bitmap clipping with masks and scaling improved.
- Fixed a crash bug in the generic timer. - Fixed a crash bug in the generic timer.
- Implemented child process termination notifications (David Bj<EFBFBD>rkevik) - Implemented child process termination notifications (David Bjrkevik)
Unix: Unix:
@@ -1116,7 +1119,7 @@ All (GUI):
- Added wxXmlResource::Unload(). - Added wxXmlResource::Unload().
- Possibility of modeless wxWizard dialog (with presentation in sample). - Possibility of modeless wxWizard dialog (with presentation in sample).
- Fixed a rare crash due to malformed HTML in wxHTML (Xavier Nodet). - Fixed a rare crash due to malformed HTML in wxHTML (Xavier Nodet).
- Ctrl+mouse wheel changes zoom factor in print preview (Zbigniew Zag<EFBFBD>rski). - Ctrl+mouse wheel changes zoom factor in print preview (Zbigniew Zagnrski).
- Cross-compile now supported for wxGTK, wxX11 and wxMotif. - Cross-compile now supported for wxGTK, wxX11 and wxMotif.
- Cygwin compilation of wxX11, wxGTK and wxMotif now supported. - Cygwin compilation of wxX11, wxGTK and wxMotif now supported.
- Now reads "help" parameter for all windows (context help text). - Now reads "help" parameter for all windows (context help text).
@@ -1131,7 +1134,7 @@ wxMSW:
- Fixed wxSlider::GetSelEnd() (Atilim Cetin). - Fixed wxSlider::GetSelEnd() (Atilim Cetin).
- Fixed accelerators of menu items added to already attached submenus. - Fixed accelerators of menu items added to already attached submenus.
- Position of wxEVT_MOUSEWHEEL events is now in client, not screen, coordinates. - Position of wxEVT_MOUSEWHEEL events is now in client, not screen, coordinates.
- Handle absence of wxListCtrl column image better (Zbigniew Zag<EFBFBD>rski). - Handle absence of wxListCtrl column image better (Zbigniew Zagrski).
- Fixed asynchronous playback of large sound files in wxSound. - Fixed asynchronous playback of large sound files in wxSound.
- Added wxDynamicLibrary::GetSymbolAorW(). - Added wxDynamicLibrary::GetSymbolAorW().
- Fixed default size of wxStaticText controls with border being too small. - Fixed default size of wxStaticText controls with border being too small.
@@ -1414,8 +1417,8 @@ All:
use accessors methods now (Mart Raudsepp) use accessors methods now (Mart Raudsepp)
- new classes for reading and writing ZIP files (M.J.Wetherell) - new classes for reading and writing ZIP files (M.J.Wetherell)
- large files support for wxFFile (M.J.Wetherell) - large files support for wxFFile (M.J.Wetherell)
- classes in the manual are now cross-referenced (Zbigniew Zag<EFBFBD>rski) - classes in the manual are now cross-referenced (Zbigniew Zagrski)
- Norwegian (Bokm<EFBFBD>l) translation added (Hans F. Nordhaug) - Norwegian (Bokmll) translation added (Hans F. Nordhaug)
- wxDynamicLibrary::HasSymbol() added - wxDynamicLibrary::HasSymbol() added
- added wxEXEC_NODISABLE flag to be used with wxExecute(wxEXEC_SYNC) - added wxEXEC_NODISABLE flag to be used with wxExecute(wxEXEC_SYNC)
- added wxTextInputStream::operator>>(wchar_t) for compilers which support this - added wxTextInputStream::operator>>(wchar_t) for compilers which support this
@@ -1464,7 +1467,7 @@ All (GUI):
- added wxMediaCtrl - added wxMediaCtrl
- added wxDatePickerCtrl - added wxDatePickerCtrl
- wxHtmlWindow now supports background images given in <body> tag - wxHtmlWindow now supports background images given in <body> tag
- wxSplitterWindow now supports gravity parameter (Zbigniew Zag<EFBFBD>rski) - wxSplitterWindow now supports gravity parameter (Zbigniew Zagrski)
- recursive wxSizer::GetItem returns item of given window, sizer or nth index - recursive wxSizer::GetItem returns item of given window, sizer or nth index
- wxLayoutConstraints now use best size, not current size, for AsIs() condition - wxLayoutConstraints now use best size, not current size, for AsIs() condition
- wxSizer::Add/Insert etc. now returns pointer to wxSizerItem just added and this - wxSizer::Add/Insert etc. now returns pointer to wxSizerItem just added and this
@@ -1772,7 +1775,7 @@ wxODBC:
All: All:
- event table macros now do some minimal type safety checks (Michael S<EFBFBD>gtrop) - event table macros now do some minimal type safety checks (Michael Sgtrop)
- added wxGzipInput/OutputStream, bug fixes in wxZlibStreams (M.J.Wetherell) - added wxGzipInput/OutputStream, bug fixes in wxZlibStreams (M.J.Wetherell)
- wxDateTime::ParseDateTime() implemented (Linus McCabe) - wxDateTime::ParseDateTime() implemented (Linus McCabe)
- wxHTTP::GetResponse() added (David Nock) - wxHTTP::GetResponse() added (David Nock)
@@ -1805,7 +1808,7 @@ All (GUI):
- added some support for C++ exceptions in the library (do read the manual!) - added some support for C++ exceptions in the library (do read the manual!)
- added wxListCtrl::GetViewRect() - added wxListCtrl::GetViewRect()
- added wxTextCtrl::MarkDirty() - added wxTextCtrl::MarkDirty()
- wxToolBar::ToggleTool() now works for radio buttons (Dag <EFBFBD>gren) - wxToolBar::ToggleTool() now works for radio buttons (Dag igren)
- wxListCtrl now sends an END_LABEL event if editing was cancelled, too - wxListCtrl now sends an END_LABEL event if editing was cancelled, too
- bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett) - bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
- status text is now restored after wxMenu help is shown in it - status text is now restored after wxMenu help is shown in it
@@ -1936,7 +1939,7 @@ All:
wxBase: wxBase:
- added Watcom makefiles - added Watcom makefiles
- fixed bug with searching in sorted arrays (J<EFBFBD>rgen Palm) - fixed bug with searching in sorted arrays (Jrgen Palm)
All GUI ports: All GUI ports:
@@ -2497,7 +2500,7 @@ All (GUI):
- polygon support in wxRegion (Klaas Holwerda) - polygon support in wxRegion (Klaas Holwerda)
- wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added - wxStreamToTextRedirector to allow easily redirect cout to wxTextCtrl added
- fixed bug with using wxExecute() to capture huge amounts of output - fixed bug with using wxExecute() to capture huge amounts of output
- new wxCalendarCtrl styles added (S<EFBFBD>ren Erland Vest<EFBFBD>) - new wxCalendarCtrl styles added (Sren Erland Vestu)
- wxWizard changes: loading from WXR support, help button (Robert Cavanaugh) - wxWizard changes: loading from WXR support, help button (Robert Cavanaugh)
- wxDirSelector() added (Paul A. Thiessen) - wxDirSelector() added (Paul A. Thiessen)
- wxGrid cell editing veto support (Roger Gammans) - wxGrid cell editing veto support (Roger Gammans)
@@ -2605,7 +2608,7 @@ wxBase:
- wxZipFSHandler::FindFirst() and FindNext() now correctly list directories - wxZipFSHandler::FindFirst() and FindNext() now correctly list directories
- wxMimeTypesManager now can create file associations too (Chris Elliott) - wxMimeTypesManager now can create file associations too (Chris Elliott)
- wxCopyFile() respects the file permissions (Roland Scholz) - wxCopyFile() respects the file permissions (Roland Scholz)
- wxFTP::GetFileSize() added (S<EFBFBD>ren Erland Vest<EFBFBD>) - wxFTP::GetFileSize() added (Sren Erland Vesti)
- wxDateTime::IsSameDate() bug fixed - wxDateTime::IsSameDate() bug fixed
- wxTimeSpan::Format() now behaves more as expected, see docs - wxTimeSpan::Format() now behaves more as expected, see docs
- wxLocale now provides much more convenient API for setting language and - wxLocale now provides much more convenient API for setting language and

7
src/richtext/richtexthtml.cpp
View File

@@ -239,8 +239,9 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
int listType = TypeOfList(thisStyle, tag); int listType = TypeOfList(thisStyle, tag);
m_listTypes.Add(listType); m_listTypes.Add(listType);
wxString align = GetAlignment(thisStyle); // wxHTML needs an extra <p> before a list when using <p> ... </p> in previous paragraphs.
str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str()); // TODO: pass a flag that indicates we're using wxHTML.
str << wxT("<p>\n");
str << tag; str << tag;
} }
@@ -290,7 +291,7 @@ void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttrEx& WXUNUSED(
stream << wxT("</td></tr></table></p>\n"); stream << wxT("</td></tr></table></p>\n");
m_inTable = false; m_inTable = false;
} }
else else if (!thisStyle.HasBulletStyle())
stream << wxT("</p>\n"); stream << wxT("</p>\n");
} }