X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0526c8cc07ac02aeb1d95afecfa0d9201a8ddea0..65fb4b3a4f18e1d8b58ac92d50d4cc7f81f03783:/samples/xrc/myframe.cpp

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 4bc975327f..6662b34597 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -61,7 +61,7 @@
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -229,9 +229,9 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
     // XRCCTRL
     wxListCtrl * const list = XRCCTRL(dlg, "controls_listctrl", wxListCtrl);
 
-    list->InsertItem(0, "Athos");   list->SetItem(0, 1, "90");
-    list->InsertItem(1, "Porthos"); list->SetItem(1, 1, "120");
-    list->InsertItem(2, "Aramis");  list->SetItem(2, 1, "80");
+    list->InsertItem(0, "Athos", 0);   list->SetItem(0, 1, "90", 2);
+    list->InsertItem(1, "Porthos", 5); list->SetItem(1, 1, "120", 3);
+    list->InsertItem(2, "Aramis", 1);  list->SetItem(2, 1, "80", 4);
 #endif // wxUSE_LISTCTRL
 
 #if wxUSE_TREECTRL