AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2012-02-20 17:58:39 +00:00
parent 55e72ca5c4
commit 6460c5990b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/richtext/richtextctrl.h
View File

@ -2278,6 +2278,9 @@ protected:
when the control's stylesheet has been replaced, for example when a file when the control's stylesheet has been replaced, for example when a file
is loaded into the control. is loaded into the control.
Valid event functions: GetOldStyleSheet, GetNewStyleSheet. Valid event functions: GetOldStyleSheet, GetNewStyleSheet.
@event{EVT_RICHTEXT_PROPERTIES_CHANGED(id, func)}
Process a @c wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED event, generated when
properties have been applied to the control. Valid event functions: GetPosition, GetRange.
@event{EVT_RICHTEXT_CONTENT_INSERTED(id, func)} @event{EVT_RICHTEXT_CONTENT_INSERTED(id, func)}
Process a @c wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED event, generated when Process a @c wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED event, generated when
content has been inserted into the control. content has been inserted into the control.

1
src/richtext/richtextctrl.cpp
View File

@ -861,7 +861,6 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
// Check for dragging across multiple containers // Check for dragging across multiple containers
long position2 = 0; long position2 = 0;
wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL; wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL;
wxRichTextDrawingContext context(& GetBuffer());
int hit2 = GetBuffer().HitTest(dc, context, logicalPt, position2, & hitObj2, & contextObj2, 0); int hit2 = GetBuffer().HitTest(dc, context, logicalPt, position2, & hitObj2, & contextObj2, 0);
if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2) if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2)
{ {