diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index cbdf952ce8..23795b1a30 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -696,7 +696,7 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
         }
         else
         {
-            images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
+            images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
         }
     }
 
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 319fecd8e1..217f126f40 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#define USE_GENERIC_TREECTRL 0
+#define USE_GENERIC_TREECTRL 1
 
 #if USE_GENERIC_TREECTRL
 #include "wx/generic/treectlg.h"