Applied colspan corrections, #15274 and #15275 (dghart)

[wxWidgets.git] / samples / memcheck / memcheck.cpp

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index e4c71458d60eee459232f39fb2c44cc9df23efc1..511d8691e697b77ce5af5d3247768cdb81a8a224 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/datetime.h"
 
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -86,7 +86,7 @@ bool MyApp::OnInit(void)
 #endif
 
   // object allocation
-  wxBrush* brush = new wxBrush(*wxRED);
+  wxBrush* brush = new wxBrush(*wxRED_BRUSH);
   wxBitmap* bitmap = new wxBitmap(100, 100);
 
   // non-object allocation