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

layout better

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-06-10 14:27:40 +00:00
parent 39c9d5ac9d
commit c131587cdb
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/richedit/wxllist.cpp
View File

@@ -2118,26 +2118,9 @@ wxLayoutList::Recalculate(wxDC &dc, CoordType bottom)
} }
} }
void
wxLayoutList::UpdateCursorScreenPos(wxDC &dc)
{
wxCHECK_RET( m_CursorLine, "no cursor line" );
// we need to save the current style, in case the layout() of the line
// changes it
wxLayoutStyleInfo SiBackup = m_CurrentStyleInfo;
m_CursorLine->Layout(dc, this,
&m_CursorScreenPos, &m_CursorSize,
m_CursorPos.x,
true /* suppress update */);
ApplyStyle(SiBackup, dc); // restore it
}
wxPoint wxPoint
wxLayoutList::GetCursorScreenPos(wxDC &dc) wxLayoutList::GetCursorScreenPos(wxDC &dc)
{ {
UpdateCursorScreenPos(dc);
return m_CursorScreenPos; return m_CursorScreenPos;
} }
@@ -2348,11 +2331,7 @@ void
wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate) wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
{ {
if ( m_movedCursor ) if ( m_movedCursor )
{
UpdateCursorScreenPos(dc);
m_movedCursor = false; m_movedCursor = false;
}
wxPoint coords(m_CursorScreenPos); wxPoint coords(m_CursorScreenPos);
coords += translate; coords += translate;

9
samples/richedit/wxllist.h
View File

@@ -32,8 +32,8 @@
// use the wxWindows caret class instead of home grown cursor whenever possible // use the wxWindows caret class instead of home grown cursor whenever possible
#ifdef __WXMSW__ #ifdef __WXMSW__
#undef WXLAYOUT_USE_CARET # undef WXLAYOUT_USE_CARET
#define WXLAYOUT_USE_CARET 1 # define WXLAYOUT_USE_CARET 1
#endif // __WXMSW__ #endif // __WXMSW__
// do not enable debug mode within Mahogany // do not enable debug mode within Mahogany
@@ -995,11 +995,6 @@ public:
*/ */
wxPoint GetCursorScreenPos(wxDC &dc); wxPoint GetCursorScreenPos(wxDC &dc);
/** Calculates the cursor position on the screen.
@param dc the dc to use for cursor position calculations
*/
void UpdateCursorScreenPos(wxDC &dc);
/** Draws the cursor. /** Draws the cursor.
@param active If true, draw a bold cursor to mark window as @param active If true, draw a bold cursor to mark window as
active. active.