applied patch 568329

[wxWidgets.git] / samples / treectrl / treetest.cpp

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 4a7a80ded0836b1087c28340a05bf48eeb0e437b..2645bfdd1b36256b63b6145e2a86f7d538e1f32e 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -41,15 +41,13 @@
 
 #include "treetest.h"
 
-// under Windows the icons are in the .rc file
-#ifndef __WXMSW__
-    #include "icon1.xpm"
-    #include "icon2.xpm"
-    #include "icon3.xpm"
-    #include "icon4.xpm"
-    #include "icon5.xpm"
-    #include "mondrian.xpm"
-#endif
+#include "icon1.xpm"
+#include "icon2.xpm"
+#include "icon3.xpm"
+#include "icon4.xpm"
+#include "icon5.xpm"
+#include "mondrian.xpm"
+
 
 // verify that the item is ok and insult the user if it is not
 #define CHECK_ITEM( item ) if ( !item.IsOk() ) {                                 \
@@ -645,20 +643,13 @@ void MyTreeCtrl::CreateImageList(int size)
     wxImageList *images = new wxImageList(size, size, TRUE);
 
     // should correspond to TreeCtrlIcon_xxx enum
-#if defined(__WXMSW__) && defined(__WIN16__)
-    images->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE));
-#else // !MSW
     wxBusyCursor wait;
     wxIcon icons[5];
-    icons[0] = wxICON(icon1);
-    icons[1] = wxICON(icon2);
-    icons[2] = wxICON(icon3);
-    icons[3] = wxICON(icon4);
-    icons[4] = wxICON(icon5);
+    icons[0] = wxIcon(icon1_xpm);
+    icons[1] = wxIcon(icon2_xpm);
+    icons[2] = wxIcon(icon3_xpm);
+    icons[3] = wxIcon(icon4_xpm);
+    icons[4] = wxIcon(icon5_xpm);
 
     int sizeOrig = icons[0].GetWidth();
     for ( size_t i = 0; i < WXSIZEOF(icons); i++ )
@@ -669,11 +660,9 @@ void MyTreeCtrl::CreateImageList(int size)
         }
         else
         {
-            images->Add(wxImage(icons[i]).Rescale(size, size).
-                                    ConvertToBitmap());
+            images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
         }
     }
-#endif // MSW/!MSW
 
     AssignImageList(images);
 }
@@ -691,19 +680,12 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
     wxImageList *images = new wxImageList(size, size, TRUE);
 
     // should correspond to TreeCtrlIcon_xxx enum
-#if defined(__WXMSW__) && defined(__WIN16__)
-    images->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap3", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap4", wxBITMAP_TYPE_BMP_RESOURCE));
-    images->Add(wxBitmap("bitmap5", wxBITMAP_TYPE_BMP_RESOURCE));
-#else // !MSW
     wxBusyCursor wait;
     wxIcon icons[4];
-    icons[0] = wxICON(icon3);   // closed
-    icons[1] = wxICON(icon3);   // closed, selected
-    icons[2] = wxICON(icon5);   // open
-    icons[3] = wxICON(icon5);   // open, selected
+    icons[0] = wxIcon(icon3_xpm);   // closed
+    icons[1] = wxIcon(icon3_xpm);   // closed, selected
+    icons[2] = wxIcon(icon5_xpm);   // open
+    icons[3] = wxIcon(icon5_xpm);   // open, selected
 
     for ( size_t i = 0; i < WXSIZEOF(icons); i++ )
     {
@@ -714,11 +696,9 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
         }
         else
         {
-            images->Add(wxImage(icons[i]).Rescale(size, size).
-                                    ConvertToBitmap());
+            images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
         }
     }
-#endif // MSW/!MSW
 
     AssignButtonsImageList(images);
 #endif