From d52f6c4eed6b400b2c2895292ccb0615e2e076bb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Jun 2005 14:36:24 +0000
Subject: [PATCH] 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
---
 samples/notebook/notebook.bkl | 1 -
 samples/notebook/notebook.cpp | 7 ++++++-
 samples/notebook/notebook.dsp | 2 +-
 samples/notebook/notebook.rc  | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 samples/notebook/notebook.rc

diff --git a/samples/notebook/notebook.bkl b/samples/notebook/notebook.bkl
index 889e35e..d777cc2 100644
--- 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 966b441..ad083b3 100644
--- 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 8b7e3c7..ed64ac0 100644
--- 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
index a05f210..0000000
--- a/samples/notebook/notebook.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian_icon ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-
-- 
2.7.4