corrected redraw problems with native controls

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 02519f2359c96d14c1ab058c74f82859cb2361be..f561950be3d145be8780fccf12a704a71b2c597f 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -21,6 +21,10 @@
     #pragma implementation "scrolwin.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -110,8 +114,14 @@ bool wxScrolledWindow::Create(wxWindow *parent,
 
     m_targetWindow = this;
 
-    // we need wxWANTS_CHARS to process arrows ourselves
-    return wxPanel::Create(parent, id, pos, size, style | wxWANTS_CHARS, name);
+    bool ok = wxPanel::Create(parent, id, pos, size, style, name);
+
+#ifdef __WXMSW__
+    // we need to process arrows ourselves for scrolling
+    m_lDlgCode |= DLGC_WANTARROWS;
+#endif // __WXMSW__
+
+    return ok;
 }
 
 wxScrolledWindow::~wxScrolledWindow()
@@ -277,63 +287,49 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
     int orient = event.GetOrientation();
 
     int nScrollInc = 0;
-    switch (event.GetEventType())
+    if (event.GetEventType() == wxEVT_SCROLLWIN_TOP)
     {
-        case wxEVT_SCROLLWIN_TOP:
-        {
             if (orient == wxHORIZONTAL)
                 nScrollInc = - m_xScrollPosition;
             else
                 nScrollInc = - m_yScrollPosition;
-            break;
-        }
-        case wxEVT_SCROLLWIN_BOTTOM:
-        {
+    } else
+    if (event.GetEventType() == wxEVT_SCROLLWIN_BOTTOM)
+    {
             if (orient == wxHORIZONTAL)
                 nScrollInc = m_xScrollLines - m_xScrollPosition;
             else
                 nScrollInc = m_yScrollLines - m_yScrollPosition;
-            break;
-        }
-        case wxEVT_SCROLLWIN_LINEUP:
-        {
+    } else
+    if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP)
+    {
             nScrollInc = -1;
-            break;
-        }
-        case wxEVT_SCROLLWIN_LINEDOWN:
-        {
+    } else
+    if (event.GetEventType() == wxEVT_SCROLLWIN_LINEDOWN)
+    {
             nScrollInc = 1;
-            break;
-        }
-        case wxEVT_SCROLLWIN_PAGEUP:
-        {
+    } else
+    if (event.GetEventType() == wxEVT_SCROLLWIN_PAGEUP)
+    {
             if (orient == wxHORIZONTAL)
                 nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
             else
                 nScrollInc = -GetScrollPageSize(wxVERTICAL);
-            break;
-        }
-        case wxEVT_SCROLLWIN_PAGEDOWN:
-        {
+    } else
+    if (event.GetEventType() == wxEVT_SCROLLWIN_PAGEDOWN)
+    {
             if (orient == wxHORIZONTAL)
                 nScrollInc = GetScrollPageSize(wxHORIZONTAL);
             else
                 nScrollInc = GetScrollPageSize(wxVERTICAL);
-            break;
-        }
-        case wxEVT_SCROLLWIN_THUMBTRACK:
-        case wxEVT_SCROLLWIN_THUMBRELEASE:
-        {
+    } else
+    if ((event.GetEventType() == wxEVT_SCROLLWIN_THUMBTRACK) ||
+        (event.GetEventType() == wxEVT_SCROLLWIN_THUMBRELEASE))
+    {
             if (orient == wxHORIZONTAL)
                 nScrollInc = pos - m_xScrollPosition;
             else
                 nScrollInc = pos - m_yScrollPosition;
-            break;
-        }
-        default:
-        {
-            break;
-        }
     }
 
     if (orient == wxHORIZONTAL)
@@ -513,7 +509,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
     int w, h;
     m_targetWindow->GetClientSize(&w, &h);
 
-    if (x_pos != -1)
+    if ((x_pos != -1) && (m_xScrollPixelsPerLine))
     {
         int old_x = m_xScrollPosition;
         m_xScrollPosition = x_pos;
@@ -528,12 +524,12 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition );
         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
 
-        if (old_x == m_xScrollPosition) return;
-
-        m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
-        m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
+        if (old_x != m_xScrollPosition) {
+            m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
+            m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
+        }
     }
-    if (y_pos != -1)
+    if ((y_pos != -1) && (m_yScrollPixelsPerLine))
     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;
@@ -548,10 +544,10 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
         
-        if (old_y == m_yScrollPosition) return;
-
-        m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
-        m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
+        if (old_y != m_yScrollPosition) {
+            m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
+            m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
+        }
     }
 
 #ifdef __WXMAC__
@@ -633,7 +629,6 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 
-    int y;
     ViewStart(&stx, &sty);
     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);
@@ -641,12 +636,12 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     if( m_xScrollPixelsPerLine )
     {
         clix /= m_xScrollPixelsPerLine;
-       szx /= m_xScrollPixelsPerLine;
+        szx /= m_xScrollPixelsPerLine;
     }
     else
     {
         clix = 0;
-       szx = -1;
+        szx = -1;
     }
     if( m_yScrollPixelsPerLine )
     {
@@ -656,15 +651,16 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     else
     {
         cliy = 0;
-       szy = -1;
+        szy = -1;
     }
 
+    int dsty;
     switch ( event.KeyCode() )
     {
         case WXK_PAGEUP:
         case WXK_PRIOR:
-            y = sty - (5 * cliy / 6);
-            Scroll(-1, (y == -1) ? 0 : y);
+            dsty = sty - (5 * cliy / 6);
+            Scroll(-1, (dsty == -1) ? 0 : dsty);
             break;
 
         case WXK_PAGEDOWN: