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/trunk@56992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dc5de0dd36
commit
29dbfacee2
@ -767,13 +767,12 @@ 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,
|
||||||
// so subtract 1 for deleted character and add 1 for conversion to character position.
|
// so subtract 1 for deleted character and add 1 for conversion to character position.
|
||||||
if (newPos > -1)
|
if (newPos > -1)
|
||||||
{
|
{
|
||||||
bool processed = false;
|
|
||||||
if (event.CmdDown())
|
if (event.CmdDown())
|
||||||
{
|
{
|
||||||
long pos = wxRichTextCtrl::FindNextWordPosition(-1);
|
long pos = wxRichTextCtrl::FindNextWordPosition(-1);
|
||||||
|
@ -793,8 +793,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();
|
||||||
}
|
}
|
||||||
@ -807,8 +805,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();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user