X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23ffcdc41d93e289cd28dab73b3afd55033c2370..6d06e061dc11140151be2914c30c759ee15e3fe7:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ace037b668..883ce7d0de 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -31,6 +31,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
                                      ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
+       XRC                           wxXRC files
 
      * one file may be listed in several groups
 
@@ -142,6 +143,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
+    src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
@@ -160,7 +162,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/filesys.cpp
     src/common/fmapbase.cpp
     src/common/fs_zip.cpp
-    src/common/gzstream.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/init.cpp
@@ -176,6 +177,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/object.cpp
     src/common/process.cpp
     src/common/regex.cpp
+    src/common/sstream.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
     src/common/stream.cpp
@@ -210,6 +212,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
+    wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
@@ -239,7 +242,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/fontmap.h
     wx/fs_mem.h
     wx/fs_zip.h
-    wx/gzstream.h
     wx/hash.h
     wx/hashmap.h
     wx/hashset.h
@@ -272,7 +274,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/regex.h
     wx/scopeguard.h
     wx/snglinst.h
+    wx/sstream.h
     wx/stack.h
+    wx/stockitem.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
@@ -307,14 +311,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="NET_UNIX_SRC" hints="files">
-    src/unix/gsocket.c
+    src/unix/gsocket.cpp
 </set>
 <set var="NET_UNIX_HDR" hints="files">
     wx/unix/gsockunx.h
 </set>
 
 <set var="NET_WIN32_SRC" hints="files">
-    src/msw/gsocket.c
+    src/msw/gsocket.cpp
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
@@ -329,14 +333,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="NET_DARWIN_SRC" hints="files">
-    src/unix/gsocket.c
+    src/unix/gsocket.cpp
 </set>
 <set var="NET_DARWIN_HDR" hints="files">
     wx/unix/gsockunx.h
 </set>
 
 <set var="NET_OS2_SRC" hints="files">
-    src/unix/gsocket.c
+    src/unix/gsocket.cpp
 </set>
 <set var="NET_OS2_HDR" hints="files">
     wx/unix/gsockunx.h
@@ -383,7 +387,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
-    src/common/clntdata.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -439,6 +442,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/settcmn.cpp
     src/common/sizer.cpp
     src/common/statbar.cpp
+    src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
     src/common/timercmn.cpp
@@ -451,6 +455,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
     src/generic/choicdgg.cpp
+    src/generic/choicbkg.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
@@ -479,7 +484,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
-    wx/clntdata.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h
@@ -561,6 +565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bookctrl.h
     wx/busyinfo.h
     wx/caret.h
+    wx/choicebk.h
     wx/clipbrd.h
     wx/cmdproc.h
     wx/colordlg.h
@@ -688,7 +693,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
     src/gtk/gdiobj.cpp
-    src/gtk/gsockgtk.c
+    src/gtk/gsockgtk.cpp
     src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/minifram.cpp
@@ -707,6 +712,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
     wx/generic/paletteg.h
+    wx/gtk/app.h
+    wx/gtk/bitmap.h
+    wx/gtk/brush.h
+    wx/gtk/clipbrd.h
+    wx/gtk/colour.h
+    wx/gtk/cursor.h
+    wx/gtk/dataform.h
+    wx/gtk/dataobj.h
+    wx/gtk/dataobj2.h
+    wx/gtk/dc.h
+    wx/gtk/dcclient.h
+    wx/gtk/dcmemory.h
+    wx/gtk/dcscreen.h
+    wx/gtk/dnd.h
+    wx/gtk/font.h
+    wx/gtk/gdiobj.h
+    wx/gtk/icon.h
+    wx/gtk/minifram.h
+    wx/gtk/pen.h
+    wx/gtk/popupwin.h
+    wx/gtk/region.h
+    wx/gtk/timer.h
+    wx/gtk/tooltip.h
+    wx/gtk/toplevel.h
+    wx/gtk/win_gtk.h
+    wx/gtk/window.h
 </set>
 <set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
@@ -724,11 +755,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
     <!-- GTK+ specific files: -->
+    src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
     src/gtk/checkbox.cpp
     src/gtk/checklst.cpp
     src/gtk/choice.cpp
+    src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
@@ -757,53 +790,34 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
+    wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/gtk/accel.h
-    wx/gtk/app.h
-    wx/gtk/bitmap.h
     wx/gtk/bmpbuttn.h
-    wx/gtk/brush.h
     wx/gtk/button.h
     wx/gtk/checkbox.h
     wx/gtk/checklst.h
+    wx/gtk/colordlg.h
     wx/gtk/choice.h
-    wx/gtk/clipbrd.h
-    wx/gtk/colour.h
     wx/gtk/combobox.h
     wx/gtk/control.h
-    wx/gtk/cursor.h
-    wx/gtk/dataform.h
-    wx/gtk/dataobj.h
-    wx/gtk/dataobj2.h
-    wx/gtk/dc.h
-    wx/gtk/dcclient.h
-    wx/gtk/dcmemory.h
-    wx/gtk/dcscreen.h
     wx/gtk/dialog.h
-    wx/gtk/dnd.h
     wx/gtk/filedlg.h
-    wx/gtk/font.h
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
     wx/gtk/gauge.h
-    wx/gtk/gdiobj.h
-    wx/gtk/icon.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
     wx/gtk/menuitem.h
-    wx/gtk/minifram.h
     wx/gtk/msgdlg.h
     wx/gtk/notebook.h
-    wx/gtk/pen.h
-    wx/gtk/popupwin.h
     wx/gtk/radiobox.h
     wx/gtk/radiobut.h
-    wx/gtk/region.h
     wx/gtk/scrolbar.h
     wx/gtk/scrolwin.h
     wx/gtk/slider.h
@@ -816,12 +830,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/tbargtk.h
     wx/gtk/textctrl.h
     wx/gtk/tglbtn.h
-    wx/gtk/timer.h
-    wx/gtk/tooltip.h
-    wx/gtk/toplevel.h
     wx/gtk/treectrl.h
-    wx/gtk/win_gtk.h
-    wx/gtk/window.h
 </set>
 
 
@@ -872,7 +881,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
-    src/motif/gsockmot.c
+    src/motif/gsockmot.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
@@ -965,7 +974,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/private.h
     wx/motif/radiobox.h
     wx/motif/radiobut.h
-    wx/motif/region.h
     wx/motif/scrolbar.h
     wx/motif/slider.h
     wx/motif/spinbutt.h
@@ -1004,7 +1012,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
-    src/x11/gsockx11.c
+    src/x11/gsockx11.cpp
     src/x11/icon.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
@@ -1084,7 +1092,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
-    src/msw/gsockmsw.c
+    src/msw/gsockmsw.cpp
     src/msw/icon.cpp
     src/msw/minifram.cpp
     src/msw/ole/dataobj.cpp
@@ -1110,8 +1118,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+    src/msw/helpchm.cpp
+    src/msw/helpwin.cpp
     src/msw/ole/automtn.cpp
-    src/msw/dirdlg.cpp
+    src/msw/ole/uuid.cpp
+</set>
+
+<set var="MSW_ONLY_LOWLEVEL_HDR" hints="files">
+    wx/msw/helpchm.h
+    wx/msw/helpwin.h
 </set>
 
 <set var="MSW_SRC" hints="files">
@@ -1127,6 +1142,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/combobox.cpp
     src/msw/control.cpp
     src/msw/dialog.cpp
+    src/msw/dirdlg.cpp
     src/msw/dragimag.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
@@ -1188,6 +1204,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
+    wx/msw/evtloop.h
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
@@ -1255,7 +1272,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- bitmaps -->
     wx/msw/colours.bmp
     wx/msw/csquery.bmp
-    wx/msw/disable.bmp
     <!-- cursors -->
     wx/msw/blank.cur
     wx/msw/bullseye.cur
@@ -1295,16 +1311,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MSW_ONLY_SRC" hints="files">
     src/msw/fdrepdlg.cpp
     src/msw/fontdlg.cpp
-    src/msw/helpchm.cpp
-    src/msw/helpwin.cpp
-    src/msw/ole/uuid.cpp
 </set>
 <set var="MSW_ONLY_HDR" hints="files">
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
     wx/msw/helpbest.h
-    wx/msw/helpchm.h
-    wx/msw/helpwin.h
     wx/msw/ole/automtn.h
     wx/msw/ole/uuid.h
 </set>
@@ -1314,17 +1325,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
+    src/msw/wince/choicece.cpp
     src/msw/wince/crt.cpp
     src/msw/wince/filedlgwce.cpp
     src/msw/wince/helpwce.cpp
+    src/msw/wince/menuce.cpp
     src/msw/wince/tbarwce.cpp
+    src/msw/wince/textctrlce.cpp
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
+    wx/msw/wince/choicece.h
     wx/msw/wince/helpwce.h
+    wx/msw/wince/libraries.h
     wx/msw/wince/missing.h
     wx/msw/wince/tbarwce.h
+    wx/msw/wince/textctrlce.h
+    wx/msw/wince/resources.h
 </set>
 
 
@@ -1442,7 +1460,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
-    src/os2/gsockpm.c
+    src/os2/gsockpm.cpp
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
@@ -1602,7 +1620,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/frame.cpp
     src/mac/carbon/gauge.cpp
     src/mac/carbon/gdiobj.cpp
-    src/mac/carbon/gsockosx.c
+    src/mac/carbon/gsockosx.cpp
     src/mac/carbon/icon.cpp
     src/mac/carbon/listbox.cpp
     src/mac/carbon/mdi.cpp
@@ -1625,6 +1643,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/settings.cpp
     src/mac/carbon/slider.cpp
     src/mac/carbon/spinbutt.cpp
+    src/mac/carbon/spinctrl.cpp
     src/mac/carbon/statbmp.cpp
     src/mac/carbon/statbox.cpp
     src/mac/carbon/statbrma.cpp
@@ -1649,6 +1668,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
+    <!-- wxWebKit files -->
+    src/html/htmlctrl/webkit/webkit.mm
 </set>
 <!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
 <set var="MAC_CMN_HDR" hints="files">
@@ -1687,6 +1708,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/frame.h
     wx/mac/gauge.h
     wx/mac/gdiobj.h
+    wx/mac/glcanvas.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h
@@ -1715,6 +1737,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/region.h
     wx/mac/scrolbar.h
     wx/mac/slider.h
+    wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
     wx/mac/statbmp.h
@@ -1823,6 +1846,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
+    <!-- wxWebKit headers -->
+    wx/html/webkit.h
 </set>
 
 
@@ -1840,6 +1865,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/NSControl.mm
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
+    src/cocoa/NSScroller.mm
     src/cocoa/NSTabView.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
@@ -1884,7 +1910,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
-    src/cocoa/region.cpp
+    src/cocoa/region.mm
+    src/cocoa/scrolbar.mm
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
     src/cocoa/spinbutt.mm
@@ -1910,11 +1937,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/paletteg.cpp
+    src/generic/regiong.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
     <!-- wxMac stuff used by wxCocoa: -->
-    src/mac/carbon/gsockosx.c
+    src/mac/carbon/gsockosx.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -1923,6 +1951,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/NSControl.h
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
+    wx/cocoa/NSScroller.h
     wx/cocoa/NSTabView.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
@@ -1958,6 +1987,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
+    wx/cocoa/log.h
     wx/cocoa/mbarman.h
     wx/cocoa/mdi.h
     wx/cocoa/menu.h
@@ -1967,6 +1997,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
+    wx/cocoa/scrolbar.h
     wx/cocoa/slider.h
     wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
@@ -1985,6 +2016,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/paletteg.h
+    wx/generic/region.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
 </set>
@@ -2187,6 +2219,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/taskbarx11.h
 </set>
 
+<set var="ADVANCED_GTK_SRC" hints="files">
+    src/gtk/taskbar.cpp
+    src/gtk/eggtrayicon.c
+</set>
+
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -2250,6 +2287,96 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 
+<!-- ====================================================================== -->
+<!--                                wxXRC                                   -->
+<!-- ====================================================================== -->
+
+<set var="XRC_SRC" hints="files">
+    src/xrc/xh_bmpbt.cpp
+    src/xrc/xh_bmp.cpp
+    src/xrc/xh_bttn.cpp
+    src/xrc/xh_cald.cpp
+    src/xrc/xh_chckb.cpp
+    src/xrc/xh_chckl.cpp
+    src/xrc/xh_choic.cpp
+    src/xrc/xh_combo.cpp
+    src/xrc/xh_dlg.cpp
+    src/xrc/xh_frame.cpp
+    src/xrc/xh_gauge.cpp
+    src/xrc/xh_gdctl.cpp
+    src/xrc/xh_html.cpp
+    src/xrc/xh_listb.cpp
+    src/xrc/xh_listc.cpp
+    src/xrc/xh_menu.cpp
+    src/xrc/xh_notbk.cpp
+    src/xrc/xh_panel.cpp
+    src/xrc/xh_radbt.cpp
+    src/xrc/xh_radbx.cpp
+    src/xrc/xh_scrol.cpp
+    src/xrc/xh_scwin.cpp
+    src/xrc/xh_sizer.cpp
+    src/xrc/xh_slidr.cpp
+    src/xrc/xh_spin.cpp
+    src/xrc/xh_split.cpp
+    src/xrc/xh_statbar.cpp
+    src/xrc/xh_stbmp.cpp
+    src/xrc/xh_stbox.cpp
+    src/xrc/xh_stlin.cpp
+    src/xrc/xh_sttxt.cpp
+    src/xrc/xh_text.cpp
+    src/xrc/xh_tglbtn.cpp
+    src/xrc/xh_toolb.cpp
+    src/xrc/xh_tree.cpp
+    src/xrc/xh_unkwn.cpp
+    src/xrc/xh_wizrd.cpp
+    src/xrc/xmlres.cpp
+    src/xrc/xmlrsall.cpp
+</set>
+<set var="XRC_HDR" hints="files">
+    wx/xrc/xh_all.h
+    wx/xrc/xh_bmpbt.h
+    wx/xrc/xh_bmp.h
+    wx/xrc/xh_bttn.h
+    wx/xrc/xh_cald.h
+    wx/xrc/xh_chckb.h
+    wx/xrc/xh_chckl.h
+    wx/xrc/xh_choic.h
+    wx/xrc/xh_combo.h
+    wx/xrc/xh_dlg.h
+    wx/xrc/xh_frame.h
+    wx/xrc/xh_gauge.h
+    wx/xrc/xh_gdctl.h
+    wx/xrc/xh_html.h
+    wx/xrc/xh_listb.h
+    wx/xrc/xh_listc.h
+    wx/xrc/xh_menu.h
+    wx/xrc/xh_notbk.h
+    wx/xrc/xh_panel.h
+    wx/xrc/xh_radbt.h
+    wx/xrc/xh_radbx.h
+    wx/xrc/xh_scrol.h
+    wx/xrc/xh_scwin.h
+    wx/xrc/xh_sizer.h
+    wx/xrc/xh_slidr.h
+    wx/xrc/xh_spin.h
+    wx/xrc/xh_split.h
+    wx/xrc/xh_statbar.h
+    wx/xrc/xh_stbmp.h
+    wx/xrc/xh_stbox.h
+    wx/xrc/xh_stlin.h
+    wx/xrc/xh_sttxt.h
+    wx/xrc/xh_text.h
+    wx/xrc/xh_tglbtn.h
+    wx/xrc/xh_toolb.h
+    wx/xrc/xh_tree.h
+    wx/xrc/xh_unkwn.h
+    wx/xrc/xh_wizrd.h
+    wx/xrc/xmlres.h
+</set>
+
+
+
+
 <!-- ====================================================================== -->
 <!--                               XML classes                              -->
 <!-- ====================================================================== -->
@@ -2331,6 +2458,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
         <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
     </set>
     <set var="BASE_PLATFORM_SRC" hints="files">
@@ -2441,7 +2570,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
@@ -2470,7 +2599,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(DBGRID_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
         </if>
     </set>
 
@@ -2498,9 +2627,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC) $(ODBC_SRC)
     </set>
-    
-    
-    
+
+
+
     <!-- ================================================================ -->
     <!--        Define where plugins sources go if USE_PLUGINS=0          -->
     <!-- ================================================================ -->
@@ -2511,7 +2640,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(UNIX_SOUND_SRC_SDL)
         </if>
     </set>
-    
+
     <set var="PLUGIN_MONOLIB_SRC">$(PLUGIN_ADV_SRC)</set>
-    
+
 </makefile>