Formerly known as wxLayout.

[wxWidgets.git] / user / wxLayout / wxlwindow.cpp

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index 093db74fa4ce1b8f052876e9e26f3dda5e4a1a42..5df8db37c5f5e1e9af0a2032300fbf910b339d08 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -6,6 +6,14 @@
  * $Id$
  *******************************************************************/
 
  * $Id$
  *******************************************************************/
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #   pragma implementation "wxlwindow.h"
 #endif
 #ifdef __GNUG__
 #   pragma implementation "wxlwindow.h"
 #endif


@@ -28,10 +36,7 @@
 #   include "gui/wxlparser.h"
 #else
 #   ifdef   __WXMSW__
 #   include "gui/wxlparser.h"
 #else
 #   ifdef   __WXMSW__

-#       include <windows.h>
-#       undef FindWindow
-#       undef GetCharWidth
-#       undef StartDoc
+#       include <wx/msw/private.h>

 #   endif
 
 #   include "wxlwindow.h"
 #   endif
 
 #   include "wxlwindow.h"


@@ -48,12 +53,20 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+

 #ifdef WXLAYOUT_DEBUG
 #  define   WXLO_DEBUG(x)      wxLogDebug x
 #else
 #  define WXLO_DEBUG(x)
 #endif
 
 #ifdef WXLAYOUT_DEBUG
 #  define   WXLO_DEBUG(x)      wxLogDebug x
 #else
 #  define WXLO_DEBUG(x)
 #endif
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+

 /// offsets to put a nice frame around text
 #define WXLO_XOFFSET   4
 #define WXLO_YOFFSET   4
 /// offsets to put a nice frame around text
 #define WXLO_XOFFSET   4
 #define WXLO_YOFFSET   4


@@ -62,6 +75,14 @@
 #define   WXLO_ROFFSET   20
 #define   WXLO_BOFFSET   20
 
 #define   WXLO_ROFFSET   20
 #define   WXLO_BOFFSET   20
 

+/// the size of one scrollbar page in pixels
+static const int X_SCROLL_PAGE = 10;
+static const int Y_SCROLL_PAGE = 20;
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+

 BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
    EVT_PAINT    (wxLayoutWindow::OnPaint)
    EVT_CHAR     (wxLayoutWindow::OnChar)
 BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
    EVT_PAINT    (wxLayoutWindow::OnPaint)
    EVT_CHAR     (wxLayoutWindow::OnChar)


@@ -75,11 +96,33 @@ BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
    EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)
 END_EVENT_TABLE()
 
    EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)
 END_EVENT_TABLE()
 

+// ===========================================================================
+// implementation
+// ===========================================================================
+
+/* LEAVE IT HERE UNTIL WXGTK WORKS AGAIN!!! */
+#ifdef __WXGTK__
+/// allows me to compare to wxPoints
+static bool operator != (wxPoint const &p1, wxPoint const &p2)
+{
+   return p1.x != p2.x || p1.y != p2.y;
+}
+#endif // __WXGTK__
+
+#ifndef wxWANTS_CHARS
+   #define wxWANTS_CHARS 0
+#endif
+
+// ----------------------------------------------------------------------------
+// wxLayoutWindow
+// ----------------------------------------------------------------------------
+

 wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
               : wxScrolledWindow(parent, -1,
                                  wxDefaultPosition, wxDefaultSize,
 wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
               : wxScrolledWindow(parent, -1,
                                  wxDefaultPosition, wxDefaultSize,

-                                 wxHSCROLL | wxVSCROLL | wxBORDER)
-
+                                 wxHSCROLL | wxVSCROLL |
+                                 wxBORDER |
+                                 wxWANTS_CHARS)

 {
    SetStatusBar(NULL); // don't use statusbar
    m_Editable = false;
 {
    SetStatusBar(NULL); // don't use statusbar
    m_Editable = false;


@@ -96,9 +139,11 @@ wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
    m_ScrollToCursor = false;
    SetWrapMargin(0);
    wxPoint max = m_llist->GetSize();
    m_ScrollToCursor = false;
    SetWrapMargin(0);
    wxPoint max = m_llist->GetSize();

-   SetScrollbars(10, 20 /*lineHeight*/, max.x/10+1, max.y/20+1);
-   EnableScrolling(true,true);
-   m_maxx = max.x; m_maxy = max.y;
+   SetScrollbars(X_SCROLL_PAGE, Y_SCROLL_PAGE,
+                 max.x / X_SCROLL_PAGE + 1, max.y / Y_SCROLL_PAGE + 1);
+   EnableScrolling(true, true);
+   m_maxx = max.x + X_SCROLL_PAGE;
+   m_maxy = max.y + Y_SCROLL_PAGE;

    m_Selecting = false;
 
 #ifdef WXLAYOUT_USE_CARET
    m_Selecting = false;
 
 #ifdef WXLAYOUT_USE_CARET


@@ -133,29 +178,24 @@ wxLayoutWindow::Clear(int family,
                       wxColour *bg)
 {
    GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
                       wxColour *bg)
 {
    GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);

-   SetBackgroundColour(GetLayoutList()->GetDefaults()->GetBGColour());
+   SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());

    ResizeScrollbars(true);
    SetDirty();
    SetModified(false);
    ResizeScrollbars(true);
    SetDirty();
    SetModified(false);

-
+   wxScrolledWindow::Clear();

    DoPaint((wxRect *)NULL);
 }
 
    DoPaint((wxRect *)NULL);
 }
 

-#ifdef __WXMSW__
-long
-wxLayoutWindow::MSWGetDlgCode()
-{
-   // if we don't return this, we won't get OnChar() events for TABs and ENTER
-   return DLGC_WANTCHARS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
-}
-#endif //MSW
-

 void
 wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 {
 void
 wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 {

-   wxPaintDC dc( this );
+   wxClientDC dc( this );

    PrepareDC( dc );
    PrepareDC( dc );

-   SetFocus();
+   if ( eventId != WXLOWIN_MENU_MOUSEMOVE )
+   {
+       // moving the mouse in a window shouldn't give it the focus!
+      SetFocus();
+   }

 
    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());
 
    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());


@@ -205,61 +245,90 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
       {
          if(! m_Selecting)
          {
       {
          if(! m_Selecting)
          {

-            m_llist->StartSelection();
+            m_llist->StartSelection(wxPoint(-1, -1), m_ClickPosition);

             m_Selecting = true;
             m_Selecting = true;

-            DoPaint(FALSE);
+            DoPaint();  // TODO: we don't have to redraw everything!

          }
          else
          {
          }
          else
          {

-            m_llist->ContinueSelection(cursorPos);
-            DoPaint(FALSE);
+            m_llist->ContinueSelection(cursorPos, m_ClickPosition);
+            DoPaint();  // TODO: we don't have to redraw everything!

          }
       }
       if(m_Selecting && ! event.LeftIsDown())
       {
          }
       }
       if(m_Selecting && ! event.LeftIsDown())
       {

-         m_llist->EndSelection(cursorPos);
+         m_llist->EndSelection(cursorPos, m_ClickPosition);

          m_Selecting = false;
          m_Selecting = false;

-         DoPaint(FALSE);
+         DoPaint();     // TODO: we don't have to redraw everything!

       }
       }

-      if(u) u->DecRef();
-      return;
-   }

 
 

-   // always move cursor to mouse click:
-   if(obj && eventId == WXLOWIN_MENU_LCLICK)
+      if ( u )
+      {
+         u->DecRef();
+         u = NULL;
+      }
+   }
+   else if(eventId == WXLOWIN_MENU_LCLICK)

    {
    {

+      // always move cursor to mouse click:

       m_llist->MoveCursorTo(cursorPos);
       m_llist->MoveCursorTo(cursorPos);

+
+      // clicking a mouse removes the selection
+      if ( m_llist->HasSelection() )
+      {
+         m_llist->DiscardSelection();
+         DoPaint();     // TODO: we don't have to redraw everything!
+      }
+
+      // Calculate where the top of the visible area is:
+      int x0, y0;
+      ViewStart(&x0,&y0);
+      int dx, dy;
+      GetScrollPixelsPerUnit(&dx, &dy);
+      x0 *= dx; y0 *= dy;
+
+      wxPoint offset(-x0+WXLO_XOFFSET, -y0+WXLO_YOFFSET);
+      m_llist->UpdateCursorScreenPos(dc, true, offset);
+

       if(m_CursorVisibility == -1)
          m_CursorVisibility = 1;
       if(m_CursorVisibility == -1)
          m_CursorVisibility = 1;

+
+      // VZ: this should be unnecessary because mouse can only click on a
+      //     visible part of the canvas
+#if 0

       ScrollToCursor();
       ScrollToCursor();

-      DoPaint(FALSE); // DoPaint suppresses flicker under GTK
-   }
+#endif // 0

 
 

-   if(!m_doSendEvents) // nothing to do
-   {
-      if(u) u->DecRef();
-      return;
+#ifdef __WXGTK__
+      DoPaint(); // DoPaint suppresses flicker under GTK
+#endif // wxGTK

    }
 
    }
 

-   // only do the menu if activated, editable and not on a clickable object
-   if(eventId == WXLOWIN_MENU_RCLICK
-      && IsEditable()
-      && (! obj || u == NULL))
+   // notify about mouse events?
+   if( m_doSendEvents )

    {
    {

-      PopupMenu(m_PopupMenu, m_ClickPosition.x, m_ClickPosition.y);
-      if(u) u->DecRef();
-      return;
-   }
+      // only do the menu if activated, editable and not on a clickable object
+      if(eventId == WXLOWIN_MENU_RCLICK
+         && IsEditable()
+         && (! obj || u == NULL))
+      {
+         PopupMenu(m_PopupMenu, m_ClickPosition.x, m_ClickPosition.y);
+         if(u) u->DecRef();
+         return;
+      }

 
 

-   if(u) u->DecRef();
-   // find the object at this position
-   if(obj)
-   {
-      wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, eventId);
-      commandEvent.SetEventObject( this );
-      commandEvent.SetClientData((char *)obj);
-      GetEventHandler()->ProcessEvent(commandEvent);
+      // find the object at this position
+      if(obj)
+      {
+         wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, eventId);
+         commandEvent.SetEventObject( this );
+         commandEvent.SetClientData((char *)obj);
+         GetEventHandler()->ProcessEvent(commandEvent);
+      }

    }
    }

+
+   if( u )
+      u->DecRef();

 }
 
 /*
 }
 
 /*


@@ -307,13 +376,20 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       cursor, etc. It's default will process all keycodes causing
       modifications to the buffer, but only if editing is allowed.
    */
       cursor, etc. It's default will process all keycodes causing
       modifications to the buffer, but only if editing is allowed.
    */

+   bool ctrlDown = event.ControlDown();

    switch(keyCode)
    {
    case WXK_RIGHT:
    switch(keyCode)
    {
    case WXK_RIGHT:

-      m_llist->MoveCursorHorizontally(1);
+      if ( ctrlDown )
+         m_llist->MoveCursorWord(1);
+      else
+         m_llist->MoveCursorHorizontally(1);

       break;
    case WXK_LEFT:
       break;
    case WXK_LEFT:

-      m_llist->MoveCursorHorizontally(-1);
+      if ( ctrlDown )
+         m_llist->MoveCursorWord(-1);
+      else
+         m_llist->MoveCursorHorizontally(-1);

       break;
    case WXK_UP:
       m_llist->MoveCursorVertically(-1);
       break;
    case WXK_UP:
       m_llist->MoveCursorVertically(-1);


@@ -322,24 +398,31 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       m_llist->MoveCursorVertically(1);
       break;
    case WXK_PRIOR:
       m_llist->MoveCursorVertically(1);
       break;
    case WXK_PRIOR:

-      m_llist->MoveCursorVertically(-20);
+      m_llist->MoveCursorVertically(-Y_SCROLL_PAGE);

       break;
    case WXK_NEXT:
       break;
    case WXK_NEXT:

-      m_llist->MoveCursorVertically(20);
+      m_llist->MoveCursorVertically(Y_SCROLL_PAGE);

       break;
    case WXK_HOME:
       break;
    case WXK_HOME:

-      m_llist->MoveCursorToBeginOfLine();
+      if ( ctrlDown )
+         m_llist->MoveCursorTo(wxPoint(0, 0));
+      else
+         m_llist->MoveCursorToBeginOfLine();

       break;
    case WXK_END:
       break;
    case WXK_END:

-      m_llist->MoveCursorToEndOfLine();
+      if ( ctrlDown )
+         m_llist->MoveCursorTo(m_llist->GetSize());
+      else
+         m_llist->MoveCursorToEndOfLine();

       break;
       break;

+

    default:
    default:

-      if(keyCode == 'c' && event.ControlDown())
+      if(keyCode == 'c' && ctrlDown)

       {
          // this should work even in read-only mode
          Copy();
       }
       {
          // this should work even in read-only mode
          Copy();
       }

-      if( IsEditable() )
+      else if( IsEditable() )

       {
          /* First, handle control keys */
          if(event.ControlDown() && ! event.AltDown())
       {
          /* First, handle control keys */
          if(event.ControlDown() && ! event.AltDown())


@@ -421,11 +504,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                   && (keyCode < 256 && keyCode >= 32)
                   )
                {
                   && (keyCode < 256 && keyCode >= 32)
                   )
                {

-                  wxString tmp;
-                  tmp += keyCode;

                   if(m_WrapMargin > 0 && isspace(keyCode))
                      m_llist->WrapLine(m_WrapMargin);
                   if(m_WrapMargin > 0 && isspace(keyCode))
                      m_llist->WrapLine(m_WrapMargin);

-                  m_llist->Insert(tmp);
+                  m_llist->Insert((char)keyCode);

                }
                break;
             }
                }
                break;
             }


@@ -445,9 +526,13 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       }
    }
 
       }
    }
 

+   // we must call ResizeScrollbars() before ScrollToCursor(), otherwise the
+   // ne cursor position might be outside the current scrolllbar range
+   ResizeScrollbars();

    ScrollToCursor();
    ScrollToCursor();

-   wxRect r = *m_llist->GetUpdateRect();
-   DoPaint(&r);
+
+   // refresh the screen
+   DoPaint(m_llist->GetUpdateRect());

 }
 
 void
 }
 
 void


@@ -479,43 +564,69 @@ wxLayoutWindow::ScrollToCursor(void)
 
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);
 
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);

-   wxASSERT(x1 > 0);
-   wxASSERT(y1 > 0);
-   // As we have the values anyway, use them to avoid unnecessary
-   // scrollbar updates.
+
+   // notice that the client size may be (0, 0)...
+   wxASSERT(x1 >= 0 && y1 >= 0);
+
+   // VZ: I think this is false - if you do it here, ResizeScrollbars() won't
+   //     call SetScrollbars() later
+#if 0
+   // As we have the values anyway, use them to avoid unnecessary scrollbar
+   // updates.

    if(x1 > m_maxx) m_maxx = x1;
    if(y1 > m_maxy) m_maxy = y1;
    if(x1 > m_maxx) m_maxx = x1;
    if(y1 > m_maxy) m_maxy = y1;

-   /* Make sure that the scrollbars are at a position so that the
-      cursor is visible if we are editing. */
-      /** Scroll so that cursor is visible! */
+#endif // 0
+
+   // Make sure that the scrollbars are at a position so that the cursor is
+   // visible if we are editing

    WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor));
    WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor));

-   wxPoint cc = m_llist->GetCursorScreenPos(*m_memDC);
-   if(cc.x < x0 || cc.y < y0
-      || cc.x >= x0+(9*x1)/10 || cc.y >= y0+(9*y1/10))  // (9*x)/10 ==  90%
+   wxPoint cc = m_llist->GetCursorScreenPos(dc);
+
+   // the cursor should be completely visible in both directions
+   wxPoint cs(m_llist->GetCursorSize());
+   int nx = -1,
+       ny = -1;
+   if ( cc.x < x0 || cc.x >= x0 + x1 - cs.x )

    {
    {

-      int nx, ny;
-      nx = cc.x - x1/2; if(nx < 0) nx = 0;
-      ny = cc.y - y1/2; if(ny < 0) ny = 0;
-      Scroll(nx/dx,ny/dy); // new view start
-      x0 = nx; y0 = ny;
-      m_ScrollToCursor = false; // avoid recursion
+      nx = cc.x - x1/2;
+      if ( nx < 0 )
+         nx = 0;
+   }
+
+   if ( cc.y < y0 || cc.y >= y0 + y1 - cs.y )
+   {
+      ny = cc.y - y1/2;
+      if ( ny < 0) 
+         ny = 0;
+   }
+
+   if ( nx != -1 || ny != -1 )
+   {
+      // set new view start
+      Scroll(nx == -1 ? -1 : (nx+dx-1)/dx, ny == -1 ? -1 : (ny+dy-1)/dy);
+
+      // avoid recursion
+      m_ScrollToCursor = false;

    }
 }
 
 void
    }
 }
 
 void

-wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))  // or: OnDraw(wxDC& dc)
+wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))

 {
    wxRect region = GetUpdateRegion().GetBox();
 {
    wxRect region = GetUpdateRegion().GetBox();

-   InternalPaint(& region);
+   InternalPaint(&region);

 }
 
 void
 wxLayoutWindow::DoPaint(const wxRect *updateRect)
 {
 }
 
 void
 wxLayoutWindow::DoPaint(const wxRect *updateRect)
 {

-#ifdef __WXGTK__
+#ifndef __WXMSW__

    InternalPaint(updateRect);
 #else
    Refresh(FALSE, updateRect); // Causes bad flicker under wxGTK!!!
    InternalPaint(updateRect);
 #else
    Refresh(FALSE, updateRect); // Causes bad flicker under wxGTK!!!

+
+   if ( !::UpdateWindow(GetHwnd()) )
+      wxLogLastError("UpdateWindow");

 #endif
 }
 
 #endif
 }
 


@@ -539,13 +650,8 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
 
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);
 
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);

-   wxASSERT(x1 > 0);
-   wxASSERT(y1 > 0);
-   // As we have the values anyway, use them to avoid unnecessary
-   // scrollbar updates.
-   if(x1 > m_maxx) m_maxx = x1;
-   if(y1 > m_maxy) m_maxy = y1;
-
+   wxASSERT(x1 >= 0);
+   wxASSERT(y1 >= 0);

 
    if(updateRect)
    {
 
    if(updateRect)
    {


@@ -574,13 +680,13 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
    }
 
    m_memDC->SetDeviceOrigin(0,0);
    }
 
    m_memDC->SetDeviceOrigin(0,0);

-   m_memDC->SetBrush(wxBrush(m_llist->GetDefaults()->GetBGColour(),wxSOLID));
-   m_memDC->SetPen(wxPen(m_llist->GetDefaults()->GetBGColour(),
+   m_memDC->SetBrush(wxBrush(m_llist->GetDefaultStyleInfo().GetBGColour(),wxSOLID));
+   m_memDC->SetPen(wxPen(m_llist->GetDefaultStyleInfo().GetBGColour(),

                          0,wxTRANSPARENT));
    m_memDC->SetLogicalFunction(wxCOPY);
                          0,wxTRANSPARENT));
    m_memDC->SetLogicalFunction(wxCOPY);

+   m_memDC->Clear();

 
 

-   /* Either fill the background with the background bitmap, or clear
-      it. */
+   // fill the background with the background bitmap

    if(m_BGbitmap)
    {
       CoordType
    if(m_BGbitmap)
    {
       CoordType


@@ -592,15 +698,8 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
             m_memDC->DrawBitmap(*m_BGbitmap, x, y);
       m_memDC->SetBackgroundMode(wxTRANSPARENT);
    }
             m_memDC->DrawBitmap(*m_BGbitmap, x, y);
       m_memDC->SetBackgroundMode(wxTRANSPARENT);
    }

-   else
-   {
-      // clear the background: (must not be done if we use the update rectangle!)
-      m_memDC->SetBackgroundMode(wxSOLID);
-      m_memDC->DrawRectangle(0,0,x1, y1);
-   }

 
 

-
-   /* This is the important bit: we tell the list to draw itself: */
+   // This is the important bit: we tell the list to draw itself

 #if WXLO_DEBUG_URECT
    if(updateRect)
    {
 #if WXLO_DEBUG_URECT
    if(updateRect)
    {


@@ -622,10 +721,13 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
    // needed to erase it):
    m_llist->InvalidateUpdateRect();
    if(m_CursorVisibility != 0)
    // needed to erase it):
    m_llist->InvalidateUpdateRect();
    if(m_CursorVisibility != 0)

+   {
+      m_llist->UpdateCursorScreenPos(dc, true, offset);

       m_llist->DrawCursor(*m_memDC,
                           m_HaveFocus && IsEditable(), // draw a thick
                           // cursor for    editable windows with focus
                           offset);
       m_llist->DrawCursor(*m_memDC,
                           m_HaveFocus && IsEditable(), // draw a thick
                           // cursor for    editable windows with focus
                           offset);

+   }

 
 // Now copy everything to the screen:
 #if 0
 
 // Now copy everything to the screen:
 #if 0


@@ -660,13 +762,22 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
 
    ResetDirty();
    m_ScrollToCursor = false;
 
    ResetDirty();
    m_ScrollToCursor = false;

-   if(m_StatusBar && m_StatusFieldCursor != -1)
+
+   if ( m_StatusBar && m_StatusFieldCursor != -1 )

    {
    {

-      wxString label;
-      label.Printf(_("Ln:%d Col:%d"),
-                   m_llist->GetCursorPos().y+1,
-                   m_llist->GetCursorPos().x+1);
-      m_StatusBar->SetStatusText(label, m_StatusFieldCursor);
+      static wxPoint s_oldCursorPos(-1, -1);
+
+      wxPoint pos(m_llist->GetCursorPos());
+
+      // avoid unnecessary status bar refreshes
+      if ( pos != s_oldCursorPos )
+      {
+         s_oldCursorPos = pos;
+
+         wxString label;
+         label.Printf(_("Ln:%d Col:%d"), pos.y + 1, pos.x + 1);
+         m_StatusBar->SetStatusText(label, m_StatusFieldCursor);
+      }

    }
 }
 
    }
 }
 


@@ -676,21 +787,26 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
 {
    wxPoint max = m_llist->GetSize();
 
 {
    wxPoint max = m_llist->GetSize();
 

-   WXLO_DEBUG(("ResizeScrollbars: GetSize: %ld, %ld", (long int)max.x,
-               (long int) max.y));
-   if(max.x > m_maxx || max.y > m_maxy
-      || max.x > m_maxx-WXLO_ROFFSET || max.y > m_maxy-WXLO_BOFFSET
-      || exact)
+   WXLO_DEBUG(("ResizeScrollbars: max size = (%ld, %ld)",
+               (long int)max.x, (long int) max.y));
+
+   if( max.x > m_maxx - WXLO_ROFFSET || max.y > m_maxy - WXLO_BOFFSET || exact )

    {
    {

-      if(! exact)
+      if ( !exact )

       {
          // add an extra bit to the sizes to avoid future updates
       {
          // add an extra bit to the sizes to avoid future updates

-         max.x = max.x+WXLO_ROFFSET;
-         max.y = max.y+WXLO_BOFFSET;
+         max.x += WXLO_ROFFSET;
+         max.y += WXLO_BOFFSET;

       }
       }

+

       ViewStart(&m_ViewStartX, &m_ViewStartY);
       ViewStart(&m_ViewStartX, &m_ViewStartY);

-      SetScrollbars(10, 20, max.x/10+1,max.y/20+1,m_ViewStartX,m_ViewStartY,true);
-      m_maxx = max.x; m_maxy = max.y;
+      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_maxx = max.x + X_SCROLL_PAGE;
+      m_maxy = max.y + Y_SCROLL_PAGE;

    }
 }
 
    }
 }
 


@@ -876,12 +992,12 @@ void
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;

-//FIXME: need argument   DoPaint(); // to repaint the cursor
+   ev.Skip();

 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;
 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;

-//FIXME: need argument   DoPaint(); // to repaint the cursor
+   ev.Skip();

 }
 }