Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

[wxWidgets.git] / samples / xrc / xrcdemo.bkl

diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index f9dc48c6a3dcf9b1185ee8fe818fce2001fbcb27..0d949591dcb416a90b81a8f9c1d2a2b5ae29b6c7 100644 (file)
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -1,34 +1,43 @@
 <?xml version="1.0" ?>
 <makefile>
 
 <?xml version="1.0" ?>
 <makefile>
 

-    <include file="../../../build/bakefiles/common_samples.bkl"/>
-    <include file="../../../build/bakefiles/common_contrib.bkl"/>
+    <include file="../../build/bakefiles/common_samples.bkl"/>

 
 

-    <exe id="xrcdemo" template="wx_contrib_sample" template_append="wx_append">
+    <exe id="xrcdemo" template="wx_sample" template_append="wx_append">

         <sources>
             xrcdemo.cpp
             myframe.cpp
             derivdlg.cpp
             custclas.cpp
         <sources>
             xrcdemo.cpp
             myframe.cpp
             derivdlg.cpp
             custclas.cpp

+            objrefdlg.cpp

         </sources>
         </sources>

+        <headers>
+            derivdlg.h
+            xrcdemo.h
+            myframe.h
+            custclas.h
+            objrefdlg.h
+        </headers>

         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>

+        <wx-lib>adv</wx-lib>

         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>

-        <win32-res>xrcdemo.rc</win32-res>

     </exe>
 
     <wx-data id="data">
         <dstdir>$(BUILDDIR)/rc</dstdir>
         <srcdir>$(SRCDIR)/rc</srcdir>
         <files>
     </exe>
 
     <wx-data id="data">
         <dstdir>$(BUILDDIR)/rc</dstdir>
         <srcdir>$(SRCDIR)/rc</srcdir>
         <files>

-            appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm
+            artprov.xpm artprov.xrc basicdlg.xpm

             basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
             derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
             fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif
             basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc
             derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc
             fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif

-            resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm
+            resource.xrc toolbar.xrc uncenter.xpm
+            objref.xrc objrefdlg.xpm

             uncenter.xrc update.gif variable.xpm variable.xrc
             uncenter.xrc update.gif variable.xpm variable.xrc

+            throbber.gif stop.xpm

         </files>
     </wx-data>
 
         </files>
     </wx-data>