minor update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 37880ef13fa50ded40a4fcfd82d238359d135c5e..e4ca6a41979a983496d640adc4fc8090a7124d8d 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -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:
       line = lastline;
    }
       // use the last line:
       line = lastline;
    }


@@ -2406,8 +2406,9 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
                                            pos.x,
                                            cursorPos ? &cursorPos->x : NULL,
                                            &foundinline);
                                            pos.x,
                                            cursorPos ? &cursorPos->x : NULL,
                                            &foundinline);

-   if(found)
-      *found = *found && foundinline;
+   if ( found )
+      *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%:
-   m_Offset = wxPoint((10*m_PageWidth)/100, (7*m_PageHeight)/100);
+   // This sets a left/top origin of 15% and 5%:
+   m_Offset = wxPoint((15*m_PageWidth)/100, (5*m_PageHeight)/100);

 
    // This is the length of the printable area.
    m_PrintoutHeight = m_PageHeight - 2*m_Offset.y;
 
    // This is the length of the printable area.
    m_PrintoutHeight = m_PageHeight - 2*m_Offset.y;

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 8100eb69fe65f3e1465b9328501d5f2fc0563bbc..76b2cb4b4061c9bc4568bf0c578b217ab946e4df 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -544,6 +544,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                Copy();
                break;
             case WXK_DELETE :
                Copy();
                break;
             case WXK_DELETE :

+               if(! deletedSelection)
+                  m_llist->DeleteWord();
+               break;

             case 'd':
                if(! deletedSelection) // already done
                   m_llist->Delete(1);
             case 'd':
                if(! deletedSelection) // already done
                   m_llist->Delete(1);