use generic sample icon; no need for separate .rc file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ad30bb374f
commit
d52f6c4eed
@ -7,7 +7,6 @@
|
||||
<sources>notebook.cpp</sources>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>notebook.rc</win32-res>
|
||||
</exe>
|
||||
|
||||
</makefile>
|
||||
|
@ -24,6 +24,10 @@
|
||||
#include "wx/artprov.h"
|
||||
#include "notebook.h"
|
||||
|
||||
#if !defined(__WXMSW__) && !defined(__WXPM__)
|
||||
#include "../sample.xpm"
|
||||
#endif
|
||||
|
||||
IMPLEMENT_APP(MyApp)
|
||||
|
||||
bool MyApp::OnInit()
|
||||
@ -202,8 +206,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
||||
m_chkShowImages = true;
|
||||
m_multi = false;
|
||||
|
||||
// menu of the sample
|
||||
SetIcon(wxICON(sample));
|
||||
|
||||
// menu of the sample
|
||||
wxMenu *menuType = new wxMenu;
|
||||
#if wxUSE_NOTEBOOK
|
||||
menuType->AppendRadioItem(ID_BOOK_NOTEBOOK, wxT("&Notebook\tCtrl-1"));
|
||||
|
@ -472,7 +472,7 @@ SOURCE=.\notebook.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\notebook.rc
|
||||
SOURCE=.\..\..\samples\sample.rc
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
@ -1,3 +0,0 @@
|
||||
mondrian_icon ICON "mondrian.ico"
|
||||
#include "wx/msw/wx.rc"
|
||||
|
Loading…
Reference in New Issue
Block a user