From 5dc5366512e9f2a375178a656f80905506f62e74 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 13 Feb 2008 04:39:59 +0000 Subject: [PATCH] fix assert at startup on non-MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/opengl/isosurf/isosurf.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index 781d2a8a16..ee60f37c25 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -49,7 +49,9 @@ #include "isosurf.h" +#if !defined(__WXMSW__) && !defined(__WXPM__) #include "../../sample.xpm" +#endif // The following part is taken largely unchanged from the original C Version @@ -253,7 +255,7 @@ bool MyApp::OnInit() wxDefaultPosition, wxDefaultSize); // Give it an icon - frame->SetIcon(wxIcon(_T("mondrian"))); + frame->SetIcon(wxICON(sample)); // Make a menubar wxMenu *fileMenu = new wxMenu;