X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c28a4e5fa598ac3eabb82ed507a8010137fca170..c6dae1699e518cb4bbc6f638b7b68f03b9abc8ab:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 327fa2e606..9a9f452a88 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -44,7 +44,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
      ====================================================================== -->
 
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+    </define-rule>
+</if>
 
 <!-- ====================================================================== -->
 <!--                               wxBase                                   -->
@@ -128,6 +131,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dde.cpp
     src/msw/dir.cpp
     src/msw/dlmsw.cpp
+    src/msw/evtloopconsole.cpp
     src/msw/mimetype.cpp
     src/msw/power.cpp
     src/msw/regconf.cpp
@@ -142,7 +146,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fswatcher.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
-    src/msw/evtloop.cpp
     src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp
@@ -157,6 +160,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/crashrpt.h
     wx/msw/dde.h
     wx/msw/debughlp.h
+    wx/msw/evtloopconsole.h
     wx/msw/gccpriv.h
     wx/msw/libraries.h
     wx/msw/mimetype.h
@@ -197,9 +201,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h
+    wx/osx/core/evtloop.h
+    wx/osx/core/objcid.h
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h
-    wx/osx/core/private/strconv_cf.h
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
@@ -268,35 +273,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/wxrsc.h
 </set>
 
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!--                              PalmOS                                    -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_PALMOS_SRC" hints="files">
-    src/palmos/base.cpp
-    src/palmos/dir.cpp
-    src/palmos/prefconf.cpp
-    src/palmos/snglinst.cpp
-    src/palmos/stdall.c
-    src/palmos/thread.cpp
-    src/palmos/utils.cpp
-    src/palmos/utilsexc.cpp
-</set>
-
-<set var="BASE_AND_GUI_PALMOS_SRC" hints="files">
-    src/palmos/main.cpp
-    src/palmos/volume.cpp
-</set>
-
-<set var="BASE_PALMOS_HDR" hints="files">
-    wx/palmos/apptbase.h
-    wx/palmos/apptrait.h
-    wx/palmos/chkconf.h
-    wx/palmos/mimetype.h
-    wx/palmos/missing.h
-    wx/palmos/stdpaths.h
-</set>
-
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                               MSDOS                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -570,6 +546,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/meta/int2type.h
     wx/meta/movable.h
     wx/meta/pod.h
+    wx/meta/removeref.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
 </set>
@@ -593,7 +570,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
-    wx/msw/private/sockmsw.h
 </set>
 
 <set var="NET_WINCE_SRC" hints="files">
@@ -742,6 +718,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
+    src/common/preferencescmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/radiobtncmn.cpp
@@ -765,6 +742,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
     src/common/textentrycmn.cpp
+    src/common/textmeasurecmn.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/uiactioncmn.cpp
@@ -793,6 +771,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/msgdlgg.cpp
     src/generic/numdlgg.cpp
     src/generic/progdlgg.cpp
+    src/generic/preferencesg.cpp
     src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/richmsgdlgg.cpp
@@ -810,6 +789,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/treebkg.cpp
     src/generic/vlbox.cpp
     src/generic/vscroll.cpp
+    src/xrc/xmlreshandler.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
     wx/affinematrix2dbase.h
@@ -818,7 +798,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -1016,6 +995,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/rawbmp.h
     wx/region.h
     wx/scopeguard.h
+    wx/simplebook.h
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
@@ -1038,6 +1018,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/vscroll.h
     wx/xpmdecod.h
     wx/xpmhand.h
+    wx/xrc/xmlreshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -1074,8 +1055,42 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxGTK                                   -->
 <!-- ====================================================================== -->
 
+<set var="GTK_WIN32_SRC" hints="files">
+    src/generic/caret.cpp
+    src/generic/imaglist.cpp
+    src/msw/ole/automtn.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/display.cpp
+    src/msw/utilswin.cpp
+    src/unix/fontenum.cpp
+    src/unix/fontutil.cpp
+</set>
+<set var="GTK_WIN32_HDR" hints="files">
+    wx/generic/caret.h
+    wx/generic/imaglist.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
+    wx/msw/ole/uuid.h
+    wx/msw/dib.h
+    wx/unix/fontutil.h
+</set>
+<set var="GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_SRC)</if>
+</set>
+<set var="GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_HDR)</if>
+</set>
 <set var="GTK_LOWLEVEL_SRC" hints="files">
-    $(XWIN_LOWLEVEL_SRC)
+    $(GTK_PLATFORM_SRC)
     src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp
@@ -1087,9 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/cursor.cpp
     src/gtk/dataobj.cpp
     src/gtk/dc.cpp
-    src/gtk/dcclient.cpp
-    src/gtk/dcmemory.cpp
-    src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/filectrl.cpp
@@ -1104,6 +1116,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/region.cpp
     src/gtk/renderer.cpp
     src/gtk/settings.cpp
+    src/gtk/textmeasure.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
     src/gtk/toplevel.cpp
@@ -1111,8 +1124,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/win_gtk.cpp
     src/gtk/window.cpp
 </set>
+<set var="GTK2_LOWLEVEL_SRC" hints="files">
+    $(GTK_LOWLEVEL_SRC)
+    src/gtk/dcclient.cpp
+    src/gtk/dcmemory.cpp
+    src/gtk/dcscreen.cpp
+</set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
-    $(XWIN_LOWLEVEL_HDR)
+    $(GTK_PLATFORM_HDR)
     wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
@@ -1125,10 +1144,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/evtloop.h
     wx/gtk/evtloopsrc.h
@@ -1138,7 +1153,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/nonownedwnd.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
-    wx/gtk/private/win_gtk.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
@@ -1153,8 +1167,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/anybutton.cpp
     src/gtk/artgtk.cpp
@@ -1176,7 +1188,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
-    src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
     src/gtk/infobar.cpp
     src/gtk/listbox.cpp
@@ -1204,10 +1215,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c
 </set>
+<set var="GTK2_SRC" hints="files">
+    $(GTK_SRC)
+    <!-- Generic implementations used by wxGPE: -->
+    src/generic/fontdlgg.cpp
+    <!-- GTK+ specific files: -->
+    src/gtk/gnome/gprint.cpp
+</set>
 <set var="GTK_HDR" hints="files">
     wx/generic/fdrepdlg.h
     wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/gtk/accel.h
@@ -1232,7 +1249,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
     wx/gtk/gauge.h
-    wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
     wx/gtk/infobar.h
     wx/gtk/listbox.h
@@ -1259,6 +1275,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/tglbtn.h
     wx/gtk/treeentry_gtk.h
 </set>
+<set var="GTK2_HDR" hints="files">
+    $(GTK_HDR)
+    wx/generic/fontdlgg.h
+    wx/gtk/gnome/gprint.h
+</set>
 
 
 <!-- ====================================================================== -->
@@ -1269,6 +1290,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_SRC)
     src/generic/icon.cpp
     src/generic/paletteg.cpp
+    src/generic/textmeasure.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp
     src/gtk1/brush.cpp
@@ -1430,6 +1452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MOTIF_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/textmeasure.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
     src/x11/palette.cpp
@@ -1595,6 +1618,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
     src/generic/icon.cpp
+    src/generic/textmeasure.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
@@ -1697,6 +1721,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/ole/dropsrc.cpp
     src/msw/ole/droptgt.cpp
     src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
@@ -1705,10 +1730,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
+    src/msw/textmeasure.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/uiaction.cpp
     src/msw/utilsgui.cpp
+    src/msw/utilswin.cpp
     src/msw/uxtheme.cpp
     src/msw/window.cpp
 </set>
@@ -1754,6 +1781,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dialog.cpp
     src/msw/dirdlg.cpp
     src/msw/dragimag.cpp
+    src/msw/evtloop.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
@@ -1835,6 +1863,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
+    wx/msw/init.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
@@ -1853,6 +1882,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/ole/dropsrc.h
     wx/msw/ole/droptgt.h
     wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
     wx/msw/ownerdrw.h
     wx/msw/palette.h
     wx/msw/panel.h
@@ -1866,7 +1896,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/rcdefs.h
     wx/msw/richmsgdlg.h
     wx/msw/scrolbar.h
-    wx/msw/setup0.h
     wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
@@ -1902,7 +1931,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/pencil.cur
     wx/msw/pntleft.cur
     wx/msw/pntright.cur
-    wx/msw/rightarr.cur
     wx/msw/roller.cur
     <!-- icons -->
     wx/msw/cdrom.ico
@@ -1964,69 +1992,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
-<!-- ====================================================================== -->
-<!--                                wxMGL                                   -->
-<!-- ====================================================================== -->
-
-<set var="MGL_LOWLEVEL_SRC" hints="files">
-    src/common/fontmgrcmn.cpp
-    src/generic/caret.cpp
-    src/generic/colour.cpp
-    src/generic/icon.cpp
-    src/generic/imaglist.cpp
-    src/generic/mask.cpp
-    src/generic/timer.cpp
-    src/mgl/app.cpp
-    src/mgl/bitmap.cpp
-    src/mgl/brush.cpp
-    src/mgl/clipbrd.cpp
-    src/mgl/cursor.cpp
-    src/mgl/data.cpp
-    src/mgl/dc.cpp
-    src/mgl/dcclient.cpp
-    src/mgl/dcmemory.cpp
-    src/mgl/dcscreen.cpp
-    src/mgl/dirmgl.cpp
-    src/mgl/evtloop.cpp
-    src/mgl/font.cpp
-    src/mgl/fontenum.cpp
-    src/mgl/fontmgr.cpp
-    src/mgl/fontutil.cpp
-    src/mgl/palette.cpp
-    src/mgl/pen.cpp
-    src/mgl/region.cpp
-    src/mgl/settings.cpp
-    src/mgl/toplevel.cpp
-    src/mgl/utils.cpp
-    src/mgl/window.cpp
-</set>
-<set var="MGL_LOWLEVEL_HDR" hints="files">
-    wx/generic/caret.h
-    wx/generic/colour.h
-    wx/generic/icon.h
-    wx/generic/imaglist.h
-    wx/generic/mask.h
-    wx/mgl/app.h
-    wx/mgl/bitmap.h
-    wx/mgl/brush.h
-    wx/mgl/chkconf.h
-    wx/mgl/clipbrd.h
-    wx/mgl/cursor.h
-    wx/mgl/dc.h
-    wx/mgl/dcclient.h
-    wx/mgl/dcmemory.h
-    wx/mgl/dcscreen.h
-    wx/mgl/font.h
-    wx/mgl/palette.h
-    wx/mgl/pen.h
-    wx/mgl/popupwin.h
-    wx/mgl/private.h
-    wx/mgl/region.h
-    wx/mgl/toplevel.h
-    wx/mgl/window.h
-</set>
-
-
 <!-- ====================================================================== -->
 <!--                                wxDFB                                   -->
 <!-- ====================================================================== -->
@@ -2038,6 +2003,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/icon.cpp
     src/generic/imaglist.cpp
     src/generic/mask.cpp
+    src/generic/textmeasure.cpp
     src/dfb/app.cpp
     src/dfb/bitmap.cpp
     src/dfb/brush.cpp
@@ -2114,6 +2080,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/mdig.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
     <!-- OS/2 specific files: -->
     src/os2/accel.cpp
     src/os2/app.cpp
@@ -2248,7 +2215,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/region.h
     wx/os2/scrolbar.h
     wx/os2/settings.h
-    wx/os2/setup0.h
     wx/os2/slider.h
     wx/os2/spinbutt.h
     wx/os2/spinctrl.h
@@ -2335,7 +2301,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/scrolbar_osx.cpp
     src/osx/slider_osx.cpp
     src/osx/spinbutt_osx.cpp
-    src/osx/spinctrl_osx.cpp
     src/osx/srchctrl_osx.cpp
     src/osx/statbox_osx.cpp
     src/osx/statline_osx.cpp
@@ -2391,6 +2356,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </if>
 </set>
 
@@ -2462,7 +2428,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/scrolbar.h
     wx/osx/slider.h
     wx/osx/spinbutt.h
-    wx/osx/spinctrl.h
     wx/osx/srchctrl.h
     wx/osx/statbmp.h
     wx/osx/statbox.h
@@ -2546,9 +2511,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h
-    wx/osx/carbon/private/mactext.h
-    wx/osx/carbon/private/overlay.h
-    wx/osx/carbon/private/print.h
     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h
@@ -2579,6 +2541,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/cocoa/nonownedwnd.mm
     src/osx/cocoa/notebook.mm
     src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/preferences.mm
     src/osx/cocoa/printdlg.mm
     src/osx/cocoa/scrolbar.mm
     src/osx/cocoa/slider.mm
@@ -2737,6 +2700,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/paletteg.cpp
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2841,7 +2805,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/themes/win32.cpp
 </set>
 
+<set var="UNIV_PLATFORM_SRC" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        src/msw/evtloop.cpp
+    </if>
+</set>
+<set var="UNIV_PLATFORM_HDR" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/evtloop.h
+    </if>
+</set>
+
 <set var="UNIV_SRC" hints="files">
+    $(UNIV_PLATFORM_SRC)
     src/generic/accel.cpp
     src/generic/clrpickerg.cpp
     src/generic/collpaneg.cpp
@@ -2893,6 +2869,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/winuniv.cpp
 </set>
 <set var="UNIV_HDR" hints="files">
+    $(UNIV_PLATFORM_HDR)
     wx/generic/accel.h
     wx/generic/animate.h
     wx/generic/clrpickerg.h
@@ -3118,12 +3095,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_OSX_COCOA_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
+    src/osx/datetimectrl_osx.cpp
+    src/osx/datectrl_osx.cpp
     src/osx/sound_osx.cpp
+    src/osx/timectrl_osx.cpp
     src/osx/carbon/sound.cpp
     src/osx/core/sound.cpp
     src/osx/cocoa/aboutdlg.mm
     src/osx/dataview_osx.cpp
     src/osx/cocoa/dataview.mm
+    src/osx/cocoa/datetimectrl.mm
     src/osx/cocoa/taskbar.mm
     src/osx/core/hidjoystick.cpp
 </set>
@@ -3131,11 +3112,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_OSX_COCOA_HDR" hints="files">
     wx/generic/animate.h
     wx/osx/dataview.h
+    wx/osx/datectrl.h
+    wx/osx/datetimectrl.h
     wx/osx/dvrenderer.h
     wx/osx/dvrenderers.h
     wx/osx/joystick.h
     wx/osx/sound.h
     wx/osx/taskbarosx.h
+    wx/osx/timectrl.h
     wx/osx/core/joystick.h
     wx/osx/cocoa/dataview.h
 </set>
@@ -3195,15 +3179,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/animate.h
 </set>
 
+<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/sound.cpp
+</set>
+<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/sound.h
+    wx/msw/taskbar.h
+</set>
+<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
+</set>
+<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
+</set>
 <set var="ADVANCED_GTK_SRC" hints="files">
+    $(ADVANCED_GTK_PLATFORM_SRC)
+    src/gtk/notifmsg.cpp
     src/gtk/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK2_SRC" hints="files">
+    $(ADVANCED_GTK_SRC)
     src/gtk/eggtrayicon.c
     src/gtk/hildon/notifmsg.cpp
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
-    wx/gtk/hildon/notifmsg.h
+    $(ADVANCED_GTK_PLATFORM_HDR)
+    wx/gtk/notifmsg.h
     wx/gtk/taskbar.h
 </set>
+<set var="ADVANCED_GTK2_HDR" hints="files">
+    $(ADVANCED_GTK_HDR)
+    wx/gtk/hildon/notifmsg.h
+</set>
 
 <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
     src/gtk/aboutdlg.cpp
@@ -3233,7 +3247,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
-    src/generic/animateg.cpp
+<!--
+Don't include src/generic/animateg.cpp many times in ADVANCED_SRC(WXUNIV=='1').
+This file is already included in [OSX_CARBON, OSX_COCOA, OSX_IPHONE, COCOA, PM, MOTIF] TOOLKITs
+and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
+-->
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='MSW'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='WINCE'">
+        src/generic/animateg.cpp
+    </if>
 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h
@@ -3271,7 +3298,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_OSX_COCOA_SRC" hints="files">
-    <!-- src/osx/cocoa/mediactrl.mm -->
+    src/osx/cocoa/mediactrl.mm
 </set>
 <set var="MEDIA_OSX_COCOA_HDR" hints="files">
 </set>
@@ -3381,21 +3408,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="WEBVIEW_SRC_PLATFORM">
     <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
-    <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
 </set>
 <set var="WEBVIEW_SRC" hints="files">
     $(WEBVIEW_SRC_PLATFORM)
     src/common/webview.cpp
     src/common/webviewarchivehandler.cpp
+    src/common/webviewfshandler.cpp
 </set>
 
 <set var="WEBVIEW_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='MSW'">
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
+        wx/msw/webview_missing.h
     </if>
-    <if cond="PLATFORM_UNIX=='1'">
+    <if cond="TOOLKIT=='GTK'">
         wx/gtk/webviewhistoryitem_webkit.h
         wx/gtk/webview_webkit.h
     </if>
@@ -3408,6 +3437,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_HDR_PLATFORM)
     wx/webview.h
     wx/webviewarchivehandler.h
+    wx/webviewfshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3455,8 +3485,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_propdlg.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
-    <!-- disabled until linking problems are fixed -->
-    <!-- src/xrc/xh_richtext.cpp -->
     src/xrc/xh_scrol.cpp
     src/xrc/xh_scwin.cpp
     src/xrc/xh_htmllbox.cpp
@@ -3525,7 +3553,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_propdlg.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
-    <!-- wx/xrc/xh_richtext.h -->
     wx/xrc/xh_scrol.h
     wx/xrc/xh_scwin.h
     wx/xrc/xh_htmllbox.h
@@ -3577,6 +3604,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
     <if cond="TOOLKIT=='OSX_IPHONE'">src/osx/iphone/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3' and PLATFORM_WIN32=='0'">
+        src/unix/glx11.cpp
+        src/gtk/glcanvas.cpp
+    </if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/gtk/glcanvas.cpp
         src/unix/glx11.cpp
@@ -3601,6 +3632,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h</if>
     <if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">
+        wx/gtk/glcanvas.h
+        wx/unix/glx11.h
+    </if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/gtk/glcanvas.h
         wx/unix/glx11.h
@@ -3633,6 +3668,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                  wxAUI                                 -->
 <!-- ====================================================================== -->
 
+<set var="AUI_GTK_SRC" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/aui/tabartgtk.cpp
+    </if>
+</set>
+<set var="AUI_GTK_HDR" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/aui/tabartgtk.h
+    </if>
+</set>
 <set var="AUI_SRC" hints="files">
     src/aui/framemanager.cpp
     src/aui/dockart.cpp
@@ -3640,6 +3685,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/aui/auibook.cpp
     src/aui/auibar.cpp
     src/aui/tabmdi.cpp
+    src/aui/tabart.cpp
+    src/xrc/xh_auinotbk.cpp
+    $(AUI_GTK_SRC)
 </set>
 <set var="AUI_HDR" hints="files">
     wx/aui/framemanager.h
@@ -3649,6 +3697,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/auibar.h
     wx/aui/tabmdi.h
     wx/aui/aui.h
+    wx/aui/tabart.h
+    wx/xrc/xh_auinotbk.h
+    $(AUI_GTK_HDR)
 </set>
 
 <!-- ====================================================================== -->
@@ -3666,6 +3717,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/ribbon/page.cpp
     src/ribbon/panel.cpp
     src/ribbon/toolbar.cpp
+    src/xrc/xh_ribbon.cpp
 </set>
 <set var="RIBBON_HDR" hints="files">
     wx/ribbon/art.h
@@ -3677,6 +3729,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ribbon/page.h
     wx/ribbon/panel.h
     wx/ribbon/toolbar.h
+    wx/xrc/xh_ribbon.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3720,6 +3773,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/richtext/richtextstyles.cpp
     src/richtext/richtextsymboldlg.cpp
     src/richtext/richtextxml.cpp
+    src/xrc/xh_richtext.cpp
 </set>
 <set var="RICHTEXT_HDR" hints="files">
     wx/richtext/richtextbackgroundpage.h
@@ -3741,8 +3795,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/richtext/richtextstylepage.h
     wx/richtext/richtextstyles.h
     wx/richtext/richtextsymboldlg.h
+    wx/richtext/richtexttabspage.h
     wx/richtext/richtextuicustomization.h
     wx/richtext/richtextxml.h
+    wx/xrc/xh_richtext.h
 </set>
 
 
@@ -3787,7 +3843,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
@@ -3796,7 +3851,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
         <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
         <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
@@ -3821,7 +3875,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
     </set>
@@ -3854,7 +3907,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- GUI sources: -->
 
     <set var="LOWLEVEL_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
@@ -3865,10 +3919,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
@@ -3880,7 +3934,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
 
@@ -3890,7 +3943,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
 
     <set var="GUI_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
@@ -3902,7 +3956,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
@@ -3932,10 +3987,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3946,21 +4001,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
     <!-- wxAdv files not used by wxUniv -->
     <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
     </set>
@@ -4036,7 +4093,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
         $(BASE_OSX_HDR)
-        $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
         $(XML_HDR)
@@ -4049,7 +4105,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_OSX_SRC)
         $(BASE_OS2_SRC)
         $(BASE_MSDOS_SRC)
-        $(BASE_PALMOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_OSX_CARBON_SRC)
         $(BASE_AND_GUI_OSX_COCOA_SRC)