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

Fixed inability to select no superscript and no subscript in wxRichTextCtrl's

Browse Source 
formatting dialog (fixes bug #10121)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-11-28 12:47:00 +00:00
parent 752801be6d
commit 225324fdb6
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -105,6 +105,8 @@ All (GUI):
- Fixed a problem with HTML list generation for wxRichTextCtrl. - Fixed a problem with HTML list generation for wxRichTextCtrl.
- wxRichTextCtrl no longer deletes a character when content is selected - wxRichTextCtrl no longer deletes a character when content is selected
before pressing Delete. before pressing Delete.
- Fixed inability to select no superscript and no subscript in wxRichTextCtrl's
formatting dialog.
- Fixed wxHTML's pagebreaks computation in tables (D.J.Stauffer). - 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.

3
src/richtext/richtextctrl.cpp
View File

@@ -913,12 +913,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
long newPos = m_caretPosition; long newPos = m_caretPosition;
DeleteSelectedContent(& newPos); bool processed = DeleteSelectedContent(& newPos);
// Submit range in character positions, which are greater than caret positions, // Submit range in character positions, which are greater than caret positions,
if (newPos < GetBuffer().GetRange().GetEnd()+1) if (newPos < GetBuffer().GetRange().GetEnd()+1)
{ {
bool processed = false;
if (event.CmdDown()) if (event.CmdDown())
{ {
long pos = wxRichTextCtrl::FindNextWordPosition(1); long pos = wxRichTextCtrl::FindNextWordPosition(1);

4
src/richtext/richtextfontpage.cpp
View File

@@ -808,8 +808,6 @@ void wxRichTextFontPage::OnRichtextfontpageSuperscriptClick( wxCommandEvent& WXU
{ {
if ( m_superscriptCtrl->Get3StateValue() == wxCHK_CHECKED) if ( m_superscriptCtrl->Get3StateValue() == wxCHK_CHECKED)
m_subscriptCtrl->Set3StateValue( wxCHK_UNCHECKED ); m_subscriptCtrl->Set3StateValue( wxCHK_UNCHECKED );
else
m_subscriptCtrl->Set3StateValue( wxCHK_CHECKED );
UpdatePreview(); UpdatePreview();
} }
@@ -822,8 +820,6 @@ void wxRichTextFontPage::OnRichtextfontpageSubscriptClick( wxCommandEvent& WXUNU
{ {
if ( m_subscriptCtrl->Get3StateValue() == wxCHK_CHECKED) if ( m_subscriptCtrl->Get3StateValue() == wxCHK_CHECKED)
m_superscriptCtrl->Set3StateValue( wxCHK_UNCHECKED ); m_superscriptCtrl->Set3StateValue( wxCHK_UNCHECKED );
else
m_superscriptCtrl->Set3StateValue( wxCHK_CHECKED );
UpdatePreview(); UpdatePreview();
} }