From b6cf9ad090a3ab83c3f14043af9798b61eaff1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 30 May 2005 13:36:13 +0000 Subject: [PATCH] Tinderbox build fix (wxCococa). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/htlbox/htlbox.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp index 95d99d5c0e..5b34dbb2fb 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -51,14 +51,7 @@ #include "wx/textfile.h" #endif -// ---------------------------------------------------------------------------- -// resources -// ---------------------------------------------------------------------------- - -// the application icon (under Windows and OS/2 it is in resources) -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) - #include "mondrian.xpm" -#endif +#include "../sample.xpm" // ---------------------------------------------------------------------------- // private classes @@ -210,7 +203,7 @@ MyFrame::MyFrame() wxDefaultPosition, wxSize(400, 500)) { // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxIcon(sample_xpm)); #if wxUSE_MENUS // create a menu bar