some fixes and speedups

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

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 2c514185bfd771bf98e2b7319bd7c71325d5d587..9ea3e73f2b1d9b5e90558b368e5d3c0a099086b4 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -2019,8 +2019,7 @@ wxLayoutList::LineBreak(void)
    m_CursorLine = m_CursorLine->Break(m_CursorPos.x, this);
    if(m_CursorLine->GetPreviousLine() == NULL)
       m_FirstLine = m_CursorLine;
-   if(m_CursorPos.x > 0)
-      m_CursorPos.y++;
+   m_CursorPos.y++;
    m_CursorPos.x = 0;
 
    // The following code will produce a height which is guaranteed to

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index cc968b10d1f364a2486e362371b3da2399497a7c..441d5a28ccd87ffc2d79fcbce901a7d13a57aab5 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -711,10 +711,6 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
 
             default:
                if((!(event.ControlDown() || event.AltDown()
-//#if 0
-                     ///FIXME: wxGTK reports MetaDown always
-                     || event.MetaDown()
-//#endif
                   ))
                   && (keyCode < 256 && keyCode >= 32)
                   )
@@ -862,19 +858,9 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
                   updateRect->x+updateRect->width,
                   updateRect->y+updateRect->height));
    }
-   if(IsDirty())
-   {
-      WXLO_DEBUG(("InternalPaint, isdirty, list size: %ld,%ld",
-                  (unsigned long) m_llist->GetSize().x,
-                  (unsigned long) m_llist->GetSize().y));
-//      m_llist->ForceTotalLayout();
-      m_llist->Layout(dc);
-      WXLO_DEBUG(("InternalPaint, isdirty, list size after layout: %ld,%ld",
-                  (unsigned long) m_llist->GetSize().x,
-                  (unsigned long) m_llist->GetSize().y));
-      ResizeScrollbars();
-      ResetDirty();
-   }
+
+   ResizeScrollbars();
+
    
    /* Check whether the window has grown, if so, we need to reallocate
       the bitmap to be larger. */
@@ -999,20 +985,24 @@ wxLayoutWindow::OnSize(wxSizeEvent &event)
    event.Skip();
 }
 
-// change the range and position of scrollbars
+/*
+Change the range and position of scrollbars. Has evolved into a
+generic Update function which will at some time later cause a repaint
+as needed. 
+*/
+
 void
 wxLayoutWindow::ResizeScrollbars(bool exact)
 {
 
-   if(IsDirty())
-   {
-      wxClientDC dc( this );
-      PrepareDC( dc );
+   if(! IsDirty())
+      return;
+   
+   wxClientDC dc( this );
+   PrepareDC( dc );
 //      m_llist->ForceTotalLayout();
-      m_llist->Layout(dc);
-      ResetDirty();
-      RequestUpdate();
-   }
+   m_llist->Layout(dc);
+   ResetDirty();
    
    wxPoint max = m_llist->GetSize();
    wxSize size = GetClientSize();
@@ -1028,7 +1018,11 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
 
    // check if the text hasn't become too big
    // TODO why do we set both at once? they're independent...
-   if( max.x > m_maxx - WXLO_ROFFSET || max.y > m_maxy - WXLO_BOFFSET || exact )
+   if( max.x > m_maxx - WXLO_ROFFSET
+       || max.y > m_maxy - WXLO_BOFFSET
+       || max.x < m_maxx - X_SCROLL_PAGE
+       || max.y < m_maxy - Y_SCROLL_PAGE
+       || exact )
    {
       // text became too large
       if ( !exact )
@@ -1038,47 +1032,35 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
          max.y += WXLO_BOFFSET;
       }
 
-      ViewStart(&m_ViewStartX, &m_ViewStartY);
-      SetScrollbars(X_SCROLL_PAGE, Y_SCROLL_PAGE,
-                    max.x / X_SCROLL_PAGE + 1, max.y / Y_SCROLL_PAGE + 1,
-                    m_ViewStartX, m_ViewStartY,
-                    true);
-
-      m_hasHScrollbar =
-      m_hasVScrollbar = true;
-
-      m_maxx = max.x + X_SCROLL_PAGE;
-      m_maxy = max.y + Y_SCROLL_PAGE;
-   }
-#if 0
-   //FIXME: this code is pretty broken, producing "arithmetic
-   //exception" crashes (div by 0??)
-   else
-   {
-      // check if the window hasn't become too big, thus making the scrollbars
-      // unnecessary
-      if ( !exact )
+      bool done = FALSE;
+      if(max.x < X_SCROLL_PAGE)
       {
-         // add an extra bit to the sizes to avoid future updates
-         max.x -= WXLO_ROFFSET;
-         max.y -= WXLO_BOFFSET;
+         SetScrollbars(0,-1,0,-1,0,-1,true);
+         m_hasHScrollbar = FALSE;
+         done = TRUE;
       }
-
-      if ( m_hasHScrollbar && (max.x < m_maxx) )
+      if(max.y < Y_SCROLL_PAGE)
       {
-         // remove the horizontal scrollbar
-         SetScrollbars(0, -1, 0, -1, 0, -1, true);
-         m_hasHScrollbar = false;
+         SetScrollbars(-1,0,-1,0,-1,0,true);
+         m_hasVScrollbar = FALSE;
+         done = TRUE;
       }
-
-      if ( m_hasVScrollbar && (max.y < m_maxy) )
+      if(! done)
       {
-         // remove the vertical scrollbar
-         SetScrollbars(-1, 0, -1, 0, -1, 0, true);
-         m_hasVScrollbar = false;
+         ViewStart(&m_ViewStartX, &m_ViewStartY);
+         SetScrollbars(X_SCROLL_PAGE,
+                       Y_SCROLL_PAGE,
+                       max.x / X_SCROLL_PAGE + 1,
+                       max.y / Y_SCROLL_PAGE + 1,
+                       m_ViewStartX, m_ViewStartY,
+                       true);
+         m_hasHScrollbar =
+            m_hasVScrollbar = true;
       }
+
+      m_maxx = max.x + X_SCROLL_PAGE;
+      m_maxy = max.y + Y_SCROLL_PAGE;
    }
-#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -1090,13 +1072,11 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
 void
 wxLayoutWindow::Paste(bool primary)
 {
+   // this only has an effect under X11:
+   if(primary) wxTheClipboard->UsePrimarySelection();
    // Read some text
    if (wxTheClipboard->Open())
    {
-#if __WXGTK__
-      if(primary)
-         wxTheClipboard->UsePrimarySelection();
-#endif
 #if wxUSE_PRIVATE_CLIPBOARD_FORMAT
       wxLayoutDataObject wxldo;
       if (wxTheClipboard->IsSupported( wxldo.GetFormat() ))