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

minor update

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-06-23 15:34:38 +00:00
parent 96f201da8b
commit 4abcafeaa3
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/richedit/wxllist.cpp
View File

@@ -2389,10 +2389,10 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
line = line->GetNextLine(); line = line->GetNextLine();
} }
bool didFind = line != NULL;
if ( !line ) if ( !line )
{ {
if ( found )
*found = false;
// use the last line: // use the last line:
line = lastline; line = lastline;
} }
@@ -2406,8 +2406,9 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
pos.x, pos.x,
cursorPos ? &cursorPos->x : NULL, cursorPos ? &cursorPos->x : NULL,
&foundinline); &foundinline);
if(found) if ( found )
*found = *found && foundinline; *found = didFind && foundinline;
return (i == NULLIT) ? NULL : *i; return (i == NULLIT) ? NULL : *i;
} }
@@ -2955,8 +2956,8 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
psdc.GetSize(&m_PageWidth, &m_PageHeight); psdc.GetSize(&m_PageWidth, &m_PageHeight);
// This sets a left/top origin of 10% and 7%: // This sets a left/top origin of 15% and 5%:
m_Offset = wxPoint((10*m_PageWidth)/100, (7*m_PageHeight)/100); m_Offset = wxPoint((15*m_PageWidth)/100, (5*m_PageHeight)/100);
// This is the length of the printable area. // This is the length of the printable area.
m_PrintoutHeight = m_PageHeight - 2*m_Offset.y; m_PrintoutHeight = m_PageHeight - 2*m_Offset.y;

3
samples/richedit/wxlwindow.cpp
View File

@@ -544,6 +544,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
Copy(); Copy();
break; break;
case WXK_DELETE : case WXK_DELETE :
if(! deletedSelection)
m_llist->DeleteWord();
break;
case 'd': case 'd':
if(! deletedSelection) // already done if(! deletedSelection) // already done
m_llist->Delete(1); m_llist->Delete(1);