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

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

docs/changes.txt

@@ -105,6 +105,8 @@ All (GUI):
 - Fixed a problem with HTML list generation for wxRichTextCtrl.
 - wxRichTextCtrl no longer deletes a character when content is selected
   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 wxHtmlWindow::SelectionToText() to correctly insert newlines after
   single-cell paragraphs.

src/richtext/richtextctrl.cpp

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

src/richtext/richtextfontpage.cpp

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