don't crash when destroying a not initialized socket (patch 1489095)

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

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 083e26c8010818d005136aca80d2ad5263264459..59a65f856e03ac1c86b0782809873b8b938f67bb 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -24,6 +24,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/sizer.h"
+#endif
+

 #include "wx/vscroll.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/vscroll.h"
 
 // ----------------------------------------------------------------------------


@@ -156,6 +160,13 @@ size_t wxVScrolledWindow::FindFirstFromBottom(size_t lineLast, bool full)
     return lineFirst;
 }
 
     return lineFirst;
 }
 

+void wxVScrolledWindow::RemoveScrollbar()
+{
+    m_lineFirst = 0;
+    m_nVisible = m_lineMax;
+    SetScrollbar(wxVERTICAL, 0, 0, 0);
+}
+

 void wxVScrolledWindow::UpdateScrollbar()
 {
     // see how many lines can we fit on screen
 void wxVScrolledWindow::UpdateScrollbar()
 {
     // see how many lines can we fit on screen


@@ -171,6 +182,25 @@ void wxVScrolledWindow::UpdateScrollbar()
         h += OnGetLineHeight(line);
     }
 
         h += OnGetLineHeight(line);
     }
 

+    // if we still have remaining space below, maybe we can fit everything?
+    if ( h < hWindow )
+    {
+        wxCoord hAll = h;
+        for ( size_t lineFirst = m_lineFirst; lineFirst > 0; lineFirst-- )
+        {
+            hAll += OnGetLineHeight(m_lineFirst - 1);
+            if ( hAll > hWindow )
+                break;
+        }
+
+        if ( hAll < hWindow )
+        {
+            // we don't need scrollbar at all
+            RemoveScrollbar();
+            return;
+        }
+    }
+

     m_nVisible = line - m_lineFirst;
 
     int pageSize = m_nVisible;
     m_nVisible = line - m_lineFirst;
 
     int pageSize = m_nVisible;


@@ -199,8 +229,15 @@ void wxVScrolledWindow::SetLineCount(size_t count)
     m_heightTotal = EstimateTotalHeight();
 
     // recalculate the scrollbars parameters
     m_heightTotal = EstimateTotalHeight();
 
     // recalculate the scrollbars parameters

-    m_lineFirst = 1;    // make sure it is != 0
-    ScrollToLine(0);
+    if ( count )
+    {
+        m_lineFirst = 1;    // make sure it is != 0
+        ScrollToLine(0);
+    }
+    else // no items
+    {
+        RemoveScrollbar();
+    }

 }
 
 void wxVScrolledWindow::RefreshLine(size_t line)
 }
 
 void wxVScrolledWindow::RefreshLine(size_t line)


@@ -263,6 +300,27 @@ void wxVScrolledWindow::RefreshAll()
     Refresh();
 }
 
     Refresh();
 }
 

+bool wxVScrolledWindow::Layout()
+{
+    if ( GetSizer() )
+    {
+        // adjust the sizer dimensions/position taking into account the
+        // virtual size and scrolled position of the window.
+
+        int w, h;
+        GetVirtualSize(&w, &h);
+
+        // x is always 0 so no variable needed
+        int y = -GetLinesHeight(0, GetFirstVisibleLine());
+
+        GetSizer()->SetDimension(0, y, w, h);
+        return true;
+    }
+
+    // fall back to default for LayoutConstraints
+    return wxPanel::Layout();
+}
+

 int wxVScrolledWindow::HitTest(wxCoord WXUNUSED(x), wxCoord y) const
 {
     const size_t lineMax = GetVisibleEnd();
 int wxVScrolledWindow::HitTest(wxCoord WXUNUSED(x), wxCoord y) const
 {
     const size_t lineMax = GetVisibleEnd();