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

Ignore Windows key

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-02-20 07:57:54 +00:00
parent abb6edd197
commit 88bee7e621
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/richtext/richtextctrl.cpp
View File

@@ -670,7 +670,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
switch ( keycode ) switch ( keycode )
{ {
case WXK_ESCAPE: case WXK_ESCAPE:
// case WXK_SPACE:
case WXK_DELETE: case WXK_DELETE:
case WXK_START: case WXK_START:
case WXK_LBUTTON: case WXK_LBUTTON:
@@ -764,6 +763,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
case WXK_NUMPAD_SEPARATOR: case WXK_NUMPAD_SEPARATOR:
case WXK_NUMPAD_SUBTRACT: case WXK_NUMPAD_SUBTRACT:
case WXK_NUMPAD_DECIMAL: case WXK_NUMPAD_DECIMAL:
case WXK_WINDOWS_LEFT:
{ {
event.Skip(); event.Skip();
return; return;
@@ -2681,6 +2681,10 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart)) if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart))
{ {
// Caret height can't be zero
if (height == 0)
height = dc.GetCharHeight();
rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height)); rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height));
return true; return true;
} }