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

Popup menu and cursor corrected. Some bugs fixed.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-06-10 17:22:02 +00:00
parent e839ce8d9b
commit da16935f6c
5 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/richedit/wxllist.cpp
View File

@@ -1071,6 +1071,7 @@ wxLayoutLine::Layout(wxDC &dc,
wxLayoutList *llist,
wxPoint *cursorPos,
wxPoint *cursorSize,
wxLayoutStyleInfo *cursorStyle,
int cx,
bool suppressSIupdate)
{
@@ -1134,6 +1135,8 @@ wxLayoutLine::Layout(wxDC &dc,
str = WXLO_CURSORCHAR;
dc.GetTextExtent(str, &width, &height, &descent);
if(cursorStyle) // set style info
*cursorStyle = llist->GetStyleInfo();
if ( cursorSize )
{
// Just in case some joker inserted an empty string object:
@@ -1144,14 +1147,15 @@ wxLayoutLine::Layout(wxDC &dc,
cursorSize->x = width;
cursorSize->y = height;
}
cursorFound = true; // no more checks
}
else
{
// on some other object
CoordType top, bottom; // unused
*cursorSize = obj->GetSize(&top,&bottom);
if(cursorSize)
*cursorSize = obj->GetSize(&top,&bottom);
cursorPos->y = m_Position.y;
cursorFound = true; // no more checks
}
@@ -1554,6 +1558,7 @@ wxLayoutList::InternalClear(void)
m_DefaultStyleInfo.m_bg = *wxWHITE;
m_CurrentStyleInfo = m_DefaultStyleInfo;
m_CursorStyleInfo = m_DefaultStyleInfo;
}
void
@@ -2153,11 +2158,13 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll,
if(line == m_CursorLine)
line->Layout(dc, this,
(wxPoint *)&m_CursorScreenPos,
(wxPoint *)&m_CursorSize, m_CursorPos.x);
(wxPoint *)&m_CursorSize,
&m_CursorStyleInfo,
m_CursorPos.x);
if(cpos && line->GetLineNumber() == cpos->y)
line->Layout(dc, this,
cpos,
csize, cpos->x);
csize, NULL, cpos->x);
else
line->Layout(dc, this);
// little condition to speed up redrawing: