diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index 1dfd6de598..84f52d8431 100644
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -77,16 +77,20 @@ wxRemotelyScrolledTreeCtrl::~wxRemotelyScrolledTreeCtrl()
 
 void wxRemotelyScrolledTreeCtrl::HideVScrollbar()
 {
-#if defined(__WXMSW__) && USE_GENERIC_TREECTRL
+#if defined(__WXMSW__)
+#if USE_GENERIC_TREECTRL
     if (!IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
+#endif
     {
         ::ShowScrollBar((HWND) GetHWND(), SB_VERT, FALSE);
     }
+#if USE_GENERIC_TREECTRL
     else
-#endif
     {
         // Implicit in overriding SetScrollbars
     }
+#endif
+#endif
 }
 
 // Number of pixels per user unit (0 or -1 for no scrollbar)