Attempting to check in this wretched cursor again. Also added SetAcceleratorTable

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 805b3159457bd26fd4d273da622c1ea743307fa6..026f8d053210dc160732084750b33d1f8f95eee4 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -27,6 +27,10 @@
 
 #include "wx/date.h"
 
 
 #include "wx/date.h"
 

+#ifdef __WXGTK__
+#include "mondrian.xpm"
+#endif
+

 #if !WXDEBUG
 #error You must set WXDEBUG to 1 on the 'make' command line (MSW) or with configure (GTK)
 #endif
 #if !WXDEBUG
 #error You must set WXDEBUG to 1 on the 'make' command line (MSW) or with configure (GTK)
 #endif


@@ -59,9 +63,7 @@ bool MyApp::OnInit(void)
   // Give it an icon
 #ifdef wx_msw
   frame->SetIcon(wxIcon("mondrian"));
   // Give it an icon
 #ifdef wx_msw
   frame->SetIcon(wxIcon("mondrian"));

-#endif
-#ifdef wx_x
-  frame->SetIcon(wxIcon("mondrian.xbm"));
+  frame->SetIcon(wxIcon(mondrian_xpm));

 #endif
 
   // Make a menubar
 #endif
 
   // Make a menubar