From: Vadim Zeitlin Date: Sun, 20 Jun 2010 18:18:36 +0000 (+0000) Subject: Correct the name of the XPM file containing the icon in xrc sample. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cc31b3c6a56ebb410fcd1762e69ac1e4645c455d Correct the name of the XPM file containing the icon in xrc sample. This fixes a compilation error introduced during de-mondrianization of the samples. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp index fe36c8acfa..103d03b851 100644 --- a/samples/xrc/myframe.cpp +++ b/samples/xrc/myframe.cpp @@ -57,10 +57,10 @@ // Regular resources (the non-XRC kind). //----------------------------------------------------------------------------- -// The application icon -// All non-MSW platforms use an xpm. MSW uses an .ico file -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) - #include "rc/appicon.xpm" +// the application icon (under Windows and OS/2 it is in resources and even +// though we could still include the XPM here it would be unused) +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif //-----------------------------------------------------------------------------