Fixing SetColumnWidth and selection handling, attempt at fixing ClearAll(), and initi...

[wxWidgets.git] / contrib / build / gizmos / gizmos.bkl

diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 31bb831e16d73b1e5b6f9fcb1d626ff14cb0a07b..828e4942923a134bc5747959c2ece6fb1a739f18 100644 (file)
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -12,6 +12,9 @@
         multicell.cpp
         splittree.cpp
         statpict.cpp
         multicell.cpp
         splittree.cpp
         statpict.cpp

+    </set>
+    
+    <set var="GIZMOS_XRC_SRC">

         xh_statpict.cpp
     </set>
 
         xh_statpict.cpp
     </set>
 


@@ -23,8 +26,8 @@
             wx/gizmos/multicell.h
             wx/gizmos/splittree.h
             wx/gizmos/statpict.h
             wx/gizmos/multicell.h
             wx/gizmos/splittree.h
             wx/gizmos/statpict.h

-            wx/gizmos/xh_statpict.h

             wx/gizmos/gizmos.h
             wx/gizmos/gizmos.h

+            wx/gizmos/xh_statpict.h

         </files>
     </headers>
 
         </files>
     </headers>
 


@@ -32,14 +35,32 @@
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GIZMOS</define>
         <sources>$(GIZMOS_SRC)</sources>
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_GIZMOS</define>
         <sources>$(GIZMOS_SRC)</sources>

+        <wx-lib>core</wx-lib>

         <wx-lib>base</wx-lib>
         <wx-lib>base</wx-lib>

+    </dll>
+    
+    <dll id="gizmos_xrcdll" template="wx_contrib_dll"
+         cond="SHARED=='1' and USE_XRC=='1'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_GIZMOS_XRC</define>
+        <sources>$(GIZMOS_XRC_SRC)</sources>
+        <library>gizmosdll</library>
+        <wx-lib>xrc</wx-lib>
+        <wx-lib>xml</wx-lib>

         <wx-lib>core</wx-lib>
         <wx-lib>core</wx-lib>

+        <wx-lib>base</wx-lib>

     </dll>
 
     <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
     </dll>
 
     <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(GIZMOS_SRC)</sources>
     </lib>

+
+    <lib id="gizmos_xrclib" template="wx_contrib_lib"
+         cond="SHARED=='0' and USE_XRC=='1'">
+        <sources>$(GIZMOS_XRC_SRC)</sources>
+    </lib>

     
     <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
     
     <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>

+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos_xrc=gizmos_xrclib+gizmos_xrcdll</set>

 
 </makefile>
 
 </makefile>