diff --git a/TODO b/TODO
index 854025c903..e3786d1d2c 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 All
 
 * problem with horz scrolling: the focus rect isn't drawn entirely...
+* write sample testing all listbox styles/events
 
 MSW
 
diff --git a/samples/univ/univ.cpp b/samples/univ/univ.cpp
index 0814b1f161..0e01d13817 100644
--- a/samples/univ/univ.cpp
+++ b/samples/univ/univ.cpp
@@ -52,7 +52,7 @@
 
 #include "wx/univ/theme.h"
 
-//#define DEBUG_SCROLL
+#define DEBUG_SCROLL
 //#define DEBUG_LISTBOX
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 1f8754f048..6f49a60a1a 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -486,12 +486,10 @@ void wxScrollHelper::DoPrepareDC(wxDC& dc)
 
     // for wxUniversal we need to set the clipping region to avoid overwriting
     // the scrollbars with the user drawing
-#if 0 //def __WXUNIVERSAL__
     wxSize size = m_win->GetClientSize();
     dc.SetClippingRegion(m_xScrollPosition * m_xScrollPixelsPerLine,
                          m_yScrollPosition * m_yScrollPixelsPerLine,
                          size.x, size.y);
-#endif // __WXUNIVERSAL__
 }
 
 void wxScrollHelper::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const