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 48ef18ffd80d1c5cfdafd7d7f71c10d5adda3e96..026f8d053210dc160732084750b33d1f8f95eee4 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -27,11 +27,15 @@
 
 #include "wx/date.h"
 
 
 #include "wx/date.h"
 

-#if !DEBUG
-#error You must set DEBUG to 1 on the 'make' command line or make.env.
+#ifdef __WXGTK__
+#include "mondrian.xpm"

 #endif
 
 #endif
 

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

 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp


@@ -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


@@ -80,7 +82,7 @@ bool MyApp::OnInit(void)
   // Show the frame
   frame->Show(TRUE);
 
   // Show the frame
   frame->Show(TRUE);
 

-//  wxDebugContext::SetCheckpoint();
+  wxDebugContext::SetCheckpoint();

   wxDebugContext::SetFile("debug.log");
 
   wxString *thing = new wxString; // WXDEBUG_NEW wxString;
   wxDebugContext::SetFile("debug.log");
 
   wxString *thing = new wxString; // WXDEBUG_NEW wxString;