use correct name for the icon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b9b8a2b5d7
commit
be708d3f3b
@ -34,9 +34,10 @@
|
|||||||
// resources
|
// resources
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// the application icon (under Windows and OS/2 it is in resources)
|
// the application icon (under Windows and OS/2 it is in resources and even
|
||||||
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
|
// though we could still include the XPM here it would be unused)
|
||||||
#include "mondrian.xpm"
|
#if !defined(__WXMSW__) && !defined(__WXPM__)
|
||||||
|
#include "../sample.xpm"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@ -140,7 +141,7 @@ MyFrame::MyFrame(const wxString& title)
|
|||||||
: wxFrame(NULL, wxID_ANY, title)
|
: wxFrame(NULL, wxID_ANY, title)
|
||||||
{
|
{
|
||||||
// set the frame icon
|
// set the frame icon
|
||||||
SetIcon(wxICON(mondrian));
|
SetIcon(wxICON(sample));
|
||||||
|
|
||||||
#if wxUSE_MENUS
|
#if wxUSE_MENUS
|
||||||
// create a menu bar
|
// create a menu bar
|
||||||
|
Loading…
Reference in New Issue
Block a user