SF.net SVN: geany: [1274] branches/geany-0.10.1/scintilla/ScintillaGTK.cxx

[ntrel at users.sourceforge.net]

Revision: 1274
          http://svn.sourceforge.net/geany/?rev=1274&view=rev
Author:   ntrel
Date:     2007-02-13 04:29:41 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Improved the auto scrolling of documents (from r1237)

Modified Paths:
--------------
    branches/geany-0.10.1/scintilla/ScintillaGTK.cxx

Modified: branches/geany-0.10.1/scintilla/ScintillaGTK.cxx
===================================================================
--- branches/geany-0.10.1/scintilla/ScintillaGTK.cxx	2007-02-13 12:02:16 UTC (rev 1273)
+++ branches/geany-0.10.1/scintilla/ScintillaGTK.cxx	2007-02-13 12:29:41 UTC (rev 1274)
@@ -2183,7 +2183,13 @@
 	rcPaint.right = ose->area.x + ose->area.width;
 	rcPaint.bottom = ose->area.y + ose->area.height;
 
-	PLATFORM_ASSERT(rgnUpdate == NULL);
+	/* We can receive an expose-event during an expose-event.
+	 * This can happen when two different scroll messages are sent at different times. */
+	if (rgnUpdate != NULL)
+	{
+		gdk_region_destroy(rgnUpdate);
+		rgnUpdate = NULL;
+	}
 #if GTK_MAJOR_VERSION >= 2
 	rgnUpdate = gdk_region_copy(ose->region);
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.