Expose the Apple menu so it can be setup manually.

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index a637d6a0a73b7c4d33870cc8d512b9db6840fe31..38ef83050b22866818bd0914ebcf9dd275e6214e 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -4,9 +4,8 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -22,8 +21,8 @@
 
 #include "wx/datetime.h"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#include "mondrian.xpm"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
 #endif
 
 #ifndef __WXDEBUG__
@@ -57,13 +56,13 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
   if ( !wxApp::OnInit() )
-         return false;
+      return false;
 
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon
-  frame->SetIcon(wxICON(mondrian));
+  frame->SetIcon(wxICON(sample));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -86,7 +85,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