From 5341bf5b60ca38630f215425239168dd98f6a5a2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Oct 2021 17:47:47 +0200
Subject: [PATCH] Remove unnecessary win32-res tags from samples bakefiles

Don't specify sample.rc as the resource file for the samples, it is used
by default anyhow, so this is unnecessary.
---
 samples/animate/anitest.bkl   | 1 -
 samples/collpane/collpane.bkl | 1 -
 samples/dataview/dataview.bkl | 1 -
 samples/popup/popup.bkl       | 1 -
 samples/propgrid/propgrid.bkl | 1 -
 samples/ribbon/ribbon.bkl     | 1 -
 samples/richtext/richtext.bkl | 1 -
 samples/splash/splash.bkl     | 1 -
 samples/treectrl/treectrl.bkl | 1 -
 samples/validate/validate.bkl | 1 -
 samples/webview/webview.bkl   | 1 -
 samples/widgets/widgets.bkl   | 1 -
 12 files changed, 12 deletions(-)

diff --git a/samples/animate/anitest.bkl b/samples/animate/anitest.bkl
index e7e4ae2d6b..12bac6ae6b 100644
--- a/samples/animate/anitest.bkl
+++ b/samples/animate/anitest.bkl
@@ -8,7 +8,6 @@
         <headers>anitest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
     <wx-data id="catalog">
diff --git a/samples/collpane/collpane.bkl b/samples/collpane/collpane.bkl
index 631dfd905e..c83d473cbc 100644
--- a/samples/collpane/collpane.bkl
+++ b/samples/collpane/collpane.bkl
@@ -7,7 +7,6 @@
         <sources>collpane.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/dataview/dataview.bkl b/samples/dataview/dataview.bkl
index 56ad8f320b..b63aa4d2d0 100644
--- a/samples/dataview/dataview.bkl
+++ b/samples/dataview/dataview.bkl
@@ -8,7 +8,6 @@
         <headers>mymodels.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/popup/popup.bkl b/samples/popup/popup.bkl
index 794779dd1f..ad4669b3b7 100644
--- a/samples/popup/popup.bkl
+++ b/samples/popup/popup.bkl
@@ -6,6 +6,5 @@
         <sources>popup.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 </makefile>
diff --git a/samples/propgrid/propgrid.bkl b/samples/propgrid/propgrid.bkl
index 71c103781c..c49cb3676a 100644
--- a/samples/propgrid/propgrid.bkl
+++ b/samples/propgrid/propgrid.bkl
@@ -17,7 +17,6 @@
         <wx-lib>propgrid</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/ribbon/ribbon.bkl b/samples/ribbon/ribbon.bkl
index 31f4e93baf..3f20649021 100644
--- a/samples/ribbon/ribbon.bkl
+++ b/samples/ribbon/ribbon.bkl
@@ -10,7 +10,6 @@
         <wx-lib>ribbon</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/richtext/richtext.bkl b/samples/richtext/richtext.bkl
index beb5b1c834..c68aa7b9bf 100644
--- a/samples/richtext/richtext.bkl
+++ b/samples/richtext/richtext.bkl
@@ -12,7 +12,6 @@
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/splash/splash.bkl b/samples/splash/splash.bkl
index 45f581b765..056594258f 100644
--- a/samples/splash/splash.bkl
+++ b/samples/splash/splash.bkl
@@ -9,7 +9,6 @@
         <wx-lib>media</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
     <wx-data id="data">
diff --git a/samples/treectrl/treectrl.bkl b/samples/treectrl/treectrl.bkl
index 3caf1ea120..807544b6fc 100644
--- a/samples/treectrl/treectrl.bkl
+++ b/samples/treectrl/treectrl.bkl
@@ -8,7 +8,6 @@
         <headers>treetest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/validate/validate.bkl b/samples/validate/validate.bkl
index bc72569d92..bbd8fdc68e 100644
--- a/samples/validate/validate.bkl
+++ b/samples/validate/validate.bkl
@@ -8,7 +8,6 @@
         <headers>validate.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/webview/webview.bkl b/samples/webview/webview.bkl
index b41f263b27..ac8f7a3f12 100644
--- a/samples/webview/webview.bkl
+++ b/samples/webview/webview.bkl
@@ -12,7 +12,6 @@
         <wx-lib>stc</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
         <if cond="OUT_OF_TREE_MAKEFILES=='0'">
             <sys-lib>$(LIB_SCINTILLA)</sys-lib>
         </if>
diff --git a/samples/widgets/widgets.bkl b/samples/widgets/widgets.bkl
index fae2281674..5c85f3aa40 100644
--- a/samples/widgets/widgets.bkl
+++ b/samples/widgets/widgets.bkl
@@ -59,7 +59,6 @@
         <headers>widgets.h itemcontainer.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>../sample.rc</win32-res>
     </exe>
 
 </makefile>