From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 8 Oct 1998 09:38:37 +0000 (+0000)
Subject: crash under FreeBSD corrected (patch by David Hobley)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9d9355c60c8316d6d188e79843b259df9486677c

crash under FreeBSD corrected (patch by David Hobley)


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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 563365f3ba..bdc9467d73 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -238,38 +238,44 @@ int wxScrolledWindow::CalcScrollInc(wxScrollEvent& event)
   }
   if (orient == wxHORIZONTAL)
   {
-        int w, h;
-		GetClientSize(&w, &h);
-
-    	int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
-    	int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
-    	if (noPositions < 0)
-      		noPositions = 0;
-
-		if ( (m_xScrollPosition + nScrollInc) < 0 )
-			nScrollInc = -m_xScrollPosition; // As -ve as we can go
-		else if ( (m_xScrollPosition + nScrollInc) > noPositions )
-			nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
-
-        return nScrollInc;
+    if (m_xScrollPixelsPerLine > 0) {
+      int w, h;
+      GetClientSize(&w, &h);
+
+      int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
+      int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
+      if (noPositions < 0)
+	noPositions = 0;
+
+      if ( (m_xScrollPosition + nScrollInc) < 0 )
+	nScrollInc = -m_xScrollPosition; // As -ve as we can go
+      else if ( (m_xScrollPosition + nScrollInc) > noPositions )
+	nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+    }
+    else
+      Refresh();
   }
   else
   {
-        int w, h;
-		GetClientSize(&w, &h);
-
-    	int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
-    	int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
-    	if (noPositions < 0)
-      		noPositions = 0;
-
-		if ( (m_yScrollPosition + nScrollInc) < 0 )
-			nScrollInc = -m_yScrollPosition; // As -ve as we can go
-		else if ( (m_yScrollPosition + nScrollInc) > noPositions )
-			nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
-
-        return nScrollInc;
+    if (m_yScrollPixelsPerLine > 0) {
+      int w, h;
+      GetClientSize(&w, &h);
+      
+      int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
+      int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
+      if (noPositions < 0)
+	noPositions = 0;
+      
+      if ( (m_yScrollPosition + nScrollInc) < 0 )
+	nScrollInc = -m_yScrollPosition; // As -ve as we can go
+      else if ( (m_yScrollPosition + nScrollInc) > noPositions )
+	nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+    }
+    else
+      Refresh();
   }
+
+  return nScrollInc;
 }
 
 // Adjust the scrollbars - new version.