From 482635118a139c87757b2228768c7b4056de82eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 24 May 2005 08:30:25 +0000 Subject: [PATCH] wxCocoa build fix. Use XPM everywhere. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/calendar/calendar.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index af492450ce..c3250143e2 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -48,11 +48,7 @@ #endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL -// 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 +#include "../sample.xpm" // ---------------------------------------------------------------------------- // private classes @@ -277,7 +273,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon - SetIcon(wxICON(sample)); + SetIcon(sample_xpm); // create a menu bar wxMenu *menuFile = new wxMenu; -- 2.50.0