remove unused XIM code, minor cleanup

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

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 3d257acc26418fc66f55f741bb75a9c67a09dda1..72e831f69d17d57d65277488ee10259d70cd2303 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -50,9 +50,9 @@ void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
     m_xScrollPixelsPerLine = pixelsPerUnitX;
     m_yScrollPixelsPerLine = pixelsPerUnitY;
 
-    m_win->m_scrollBar[0]->adjustment->value =
+    m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value =
     m_xScrollPosition = xPos;
-    m_win->m_scrollBar[1]->adjustment->value =
+    m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value =
     m_yScrollPosition = yPos;
 
     // Setting hints here should arguably be deprecated, but without it
@@ -88,19 +88,24 @@ void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
                                              int *lines,
                                              int *linesPerPage)
 {
-    // GtkRange won't allow upper == lower, so for disabled state use [0,1]
-    //   with a page size of 1. This will also clamp position to 0.
-    int upper = 1;
-    int page_size = 1;
-    if (pixelsPerLine > 0 && winSize < virtSize)
+    int upper;
+    int page_size;
+    if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
     {
         upper = (virtSize + pixelsPerLine - 1) / pixelsPerLine;
         page_size = winSize / pixelsPerLine;
+        *lines = upper;
+        *linesPerPage = page_size;
+    }
+    else
+    {
+        // GtkRange won't allow upper == lower, so for disabled state use [0,1]
+        //   with a page size of 1. This will also clamp position to 0.
+        upper = 1;
+        page_size = 1;
+        *lines = 0;
+        *linesPerPage = 0;
     }
-
-    *lines = upper;
-    *linesPerPage = page_size;
-
     GtkAdjustment* adj = range->adjustment;
     adj->step_increment = 1;
     adj->page_increment =
@@ -113,15 +118,39 @@ void wxScrollHelperNative::AdjustScrollbars()
     int w, h;
     int vw, vh;
 
-    m_targetWindow->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;
+    // this flag indicates which window has the scrollbars
+    m_win->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;
 
-    m_targetWindow->GetClientSize( &w, &h );
     m_targetWindow->GetVirtualSize( &vw, &vh );
 
-    DoAdjustScrollbar(m_win->m_scrollBar[0], m_xScrollPixelsPerLine, w, vw,
-                      &m_xScrollLines, &m_xScrollLinesPerPage);
-    DoAdjustScrollbar(m_win->m_scrollBar[1], m_yScrollPixelsPerLine, h, vh,
-                      &m_yScrollLines, &m_yScrollLinesPerPage);
+    m_targetWindow->GetClientSize(&w, NULL);
+    DoAdjustScrollbar(
+        m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPixelsPerLine,
+        w, vw, &m_xScrollLines, &m_xScrollLinesPerPage);
+    m_targetWindow->GetClientSize(NULL, &h);
+    DoAdjustScrollbar(
+        m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPixelsPerLine,
+        h, vh, &m_yScrollLines, &m_yScrollLinesPerPage);
+
+    const int w_old = w;
+    m_targetWindow->GetClientSize(&w, NULL);
+    if (w != w_old)
+    {
+        // It is necessary to repeat the calculations in this case to avoid an
+        // observed infinite series of size events, involving alternating
+        // changes in visibility of the scrollbars.
+        // At this point, GTK+ has already queued a resize, which will cause
+        // AdjustScrollbars() to be called again. If the scrollbar visibility
+        // is not correct before then, yet another resize will occur, possibly
+        // leading to an unending series if the sizes are just right.
+        DoAdjustScrollbar(
+            m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPixelsPerLine,
+            w, vw, &m_xScrollLines, &m_xScrollLinesPerPage);
+        m_targetWindow->GetClientSize(NULL, &h);
+        DoAdjustScrollbar(
+            m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPixelsPerLine,
+            h, vh, &m_yScrollLines, &m_yScrollLinesPerPage);
+    }
 }
 
 void wxScrollHelperNative::DoScroll(int orient,