Initial version of wxStyledTextCtrl, a Scintilla wrapper. There is

[wxWidgets.git] / src / generic / scrolwin.cpp

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 17facb6ea23aaf37fa686042c4e2a2aca1fd2d4a..6834384fadce8ebc2f893b04ef313ebaeae6f501 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -85,6 +85,7 @@ wxScrolledWindow::wxScrolledWindow()
     m_yScrollLinesPerPage = 0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;
     m_yScrollLinesPerPage = 0;
     m_scaleX = 1.0;
     m_scaleY = 1.0;

+    m_targetWindow = (wxWindow*) NULL;

 }
 
 bool wxScrolledWindow::Create(wxWindow *parent,
 }
 
 bool wxScrolledWindow::Create(wxWindow *parent,


@@ -129,16 +130,20 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
                int noUnitsX, int noUnitsY,
                int xPos, int yPos, bool noRefresh )
 {
                int noUnitsX, int noUnitsY,
                int xPos, int yPos, bool noRefresh )
 {

+    int xpos, ypos;
+
+    CalcUnscrolledPosition(xPos, yPos, &xpos, &ypos);

     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||
     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||

-      (noUnitsX < m_xScrollLines) ||
+      (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX*noUnitsX) || 
+

       (noUnitsY != 0 && m_yScrollLines == 0) ||
       (noUnitsY != 0 && m_yScrollLines == 0) ||

-      (noUnitsY < m_yScrollLines) ||
+      (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY*noUnitsY) ||

       (xPos != m_xScrollPosition) ||
       (xPos != m_xScrollPosition) ||

-      (yPos != m_yScrollPosition) ||
-      (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
-      (pixelsPerUnitY != m_yScrollPixelsPerLine)
+      (yPos != m_yScrollPosition)
+//       (pixelsPerUnitX != m_xScrollPixelsPerLine) ||
+//       (pixelsPerUnitY != m_yScrollPixelsPerLine)

     );
 
     m_xScrollPixelsPerLine = pixelsPerUnitX;
     );
 
     m_xScrollPixelsPerLine = pixelsPerUnitX;


@@ -317,6 +322,7 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
             break;
         }
         case wxEVT_SCROLLWIN_THUMBTRACK:
             break;
         }
         case wxEVT_SCROLLWIN_THUMBTRACK:

+        case wxEVT_SCROLLWIN_THUMBRELEASE:

         {
             if (orient == wxHORIZONTAL)
                 nScrollInc = pos - m_xScrollPosition;
         {
             if (orient == wxHORIZONTAL)
                 nScrollInc = pos - m_xScrollPosition;


@@ -498,6 +504,9 @@ void wxScrolledWindow::SetScrollPageSize(int orient, int pageSize)
  */
 void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 {
  */
 void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 {

+    if (!m_targetWindow)
+        return;
+

     if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
         ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
 
     if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
         ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
 


@@ -649,11 +658,13 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
        szy = -1;
     }
 
        szy = -1;
     }
 

+    int dsty;

     switch ( event.KeyCode() )
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:
     switch ( event.KeyCode() )
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:

-            Scroll(-1, sty - (5 * cliy / 6));
+            dsty = sty - (5 * cliy / 6);
+            Scroll(-1, (dsty == -1) ? 0 : dsty);

             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN: