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

diff --git a/samples/notebook/notebook.bkl b/samples/notebook/notebook.bkl
index 889e35e3b44576e312768daa071ade9c3c03e5c2..d777cc271576404dbdc28eb7e3d74ae8208e2c1b 100644 (file)
--- a/samples/notebook/notebook.bkl
+++ b/samples/notebook/notebook.bkl
@@ -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>

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 966b441350a7f9cda98390185a4fae232ab39c0b..ad083b352e99d7d60dbddbfdefc5dfc04916603a 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -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"));

diff --git a/samples/notebook/notebook.dsp b/samples/notebook/notebook.dsp
index 8b7e3c7d22324c37b746165e0c49a8f0565899b4..ed64ac0dc201bc92b075ea7ea087a08dc46bfaea 100644 (file)
--- a/samples/notebook/notebook.dsp
+++ b/samples/notebook/notebook.dsp
@@ -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

diff --git a/samples/notebook/notebook.rc b/samples/notebook/notebook.rc
deleted file mode 100644 (file)
index a05f210..0000000
--- a/samples/notebook/notebook.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian_icon ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-