1. more work on multiline text ctrl (scrolling...)

2. minor bugs in listbox/scrollbar fixed


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

include/wx/univ/textctrl.h

@@ -296,7 +296,14 @@ protected:
     // set the caret to its initial (default) position
     void InitInsertionPoint();
 
+    // get the width of the longest line in pixels
+    wxCoord GetMaxWidth() const;
+
+    // update the max width if the width of this line is greater than it
+    void UpdateMaxWidth(long line);
+
     // event handlers
+    void OnIdle(wxIdleEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnSize(wxSizeEvent& event);
 
@@ -315,6 +322,9 @@ protected:
     }
 
 private:
+    // update the scrollbars (only called from OnIdle)
+    void UpdateScrollbars();
+
     // the initially specified control size
     wxSize m_sizeInitial;
 
@@ -329,6 +339,9 @@ private:
          m_curCol,
          m_curRow;
 
+    // last position (only used by GetLastPosition())
+    long m_posLast;
+
     // selection
     long m_selAnchor,
          m_selStart,
@@ -353,6 +366,19 @@ private:
     wxCoord m_posLastVisible;
     long m_colLastVisible;
 
+    // this section is for the controls with scrollbar(s)
+
+    // the current ranges of the scrollbars
+    int m_scrollRangeX,
+        m_scrollRangeY;
+
+    // should we adjust the horz/vert scrollbar?
+    bool m_updateScrollbarX,
+         m_updateScrollbarY;
+
+    // the max line length in pixels
+    wxCoord m_widthMax;
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };