]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/files.bkl
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added func parameter to wxOnAssert
[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0cee2b7f028d0782d95d07a658e24a5734ae36a3..0c01325b7ffe2c604aabad59d3837819f2a38317 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -115,6 +115,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/gccpriv.h
     wx/msw/libraries.h
     wx/msw/mimetype.h
     wx/msw/gccpriv.h
     wx/msw/libraries.h
     wx/msw/mimetype.h
+    wx/msw/mslu.h
+    wx/msw/private.h
+    wx/msw/regconf.h
+    wx/msw/registry.h
     wx/msw/stackwalk.h
     wx/msw/stdpaths.h
     wx/msw/winundef.h
     wx/msw/stackwalk.h
     wx/msw/stdpaths.h
     wx/msw/winundef.h
@@ -230,6 +234,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/apptbase.h
     wx/os2/apptrait.h
     wx/os2/mimetype.h
     wx/os2/apptbase.h
     wx/os2/apptrait.h
     wx/os2/mimetype.h
+    wx/os2/private.h
     wx/os2/stdpaths.h
     wx/os2/chkconf.h
 </set>
     wx/os2/stdpaths.h
     wx/os2/chkconf.h
 </set>
@@ -629,6 +634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/splitter.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/splitter.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
+    src/generic/toolbkg.cpp
     src/generic/treectlg.cpp
     src/generic/treebkg.cpp
     src/generic/vlbox.cpp
     src/generic/treectlg.cpp
     src/generic/treebkg.cpp
     src/generic/vlbox.cpp
@@ -715,6 +721,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/validate.h
     wx/valtext.h
     wx/window.h
     wx/validate.h
     wx/valtext.h
     wx/window.h
+    wx/wupdlock.h
 
     wx/accel.h
     wx/access.h
 
     wx/accel.h
     wx/access.h
@@ -722,6 +729,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bitmap.h
     wx/bookctrl.h
     wx/busyinfo.h
     wx/bitmap.h
     wx/bookctrl.h
     wx/busyinfo.h
+    wx/generic/busyinfo.h
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
@@ -735,6 +743,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
+    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
@@ -794,6 +803,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tbarbase.h
     wx/tglbtn.h
     wx/tipwin.h
     wx/tbarbase.h
     wx/tglbtn.h
     wx/tipwin.h
+    wx/toolbook.h
     wx/tooltip.h
     wx/toplevel.h
     wx/treebase.h
     wx/tooltip.h
     wx/toplevel.h
     wx/treebase.h
@@ -825,7 +835,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
     wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
-    wx/unix/displayx11.h
 </set>
 
 
 </set>
 
 
@@ -929,6 +938,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
+    src/gtk/gnome/gvfs.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -948,6 +958,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
+    src/gtk/treeentry_gtk.c
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
@@ -972,6 +983,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/frame.h
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/frame.h
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
+    wx/gtk/gnome/gvfs.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -993,6 +1005,168 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/textctrl.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
     wx/gtk/textctrl.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
+    wx/gtk/treeentry_gtk.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                                wxGTK1                                  -->
+<!-- ====================================================================== -->
+
+<set var="GTK1_LOWLEVEL_SRC" hints="files">
+    $(XWIN_LOWLEVEL_SRC)
+    src/generic/paletteg.cpp
+    src/gtk1/app.cpp
+    src/gtk1/bitmap.cpp
+    src/gtk1/brush.cpp
+    src/gtk1/clipbrd.cpp
+    src/gtk1/colour.cpp
+    src/gtk1/cursor.cpp
+    src/gtk1/data.cpp
+    src/gtk1/dataobj.cpp
+    src/gtk1/dc.cpp
+    src/gtk1/dcclient.cpp
+    src/gtk1/dcmemory.cpp
+    src/gtk1/dcscreen.cpp
+    src/gtk1/dnd.cpp
+    src/gtk1/evtloop.cpp
+    src/gtk1/font.cpp
+    src/gtk1/gdiobj.cpp
+    src/gtk1/gsockgtk.cpp
+    src/gtk1/icon.cpp
+    src/gtk1/main.cpp
+    src/gtk1/minifram.cpp
+    src/gtk1/pen.cpp
+    src/gtk1/popupwin.cpp
+    src/gtk1/region.cpp
+    src/gtk1/renderer.cpp
+    src/gtk1/settings.cpp
+    src/gtk1/timer.cpp
+    src/gtk1/tooltip.cpp
+    src/gtk1/toplevel.cpp
+    src/gtk1/utilsgtk.cpp
+    src/gtk1/win_gtk.c
+    src/gtk1/window.cpp
+</set>
+<set var="GTK1_LOWLEVEL_HDR" hints="files">
+    $(XWIN_LOWLEVEL_HDR)
+    wx/generic/paletteg.h
+    wx/gtk1/app.h
+    wx/gtk1/bitmap.h
+    wx/gtk1/brush.h
+    wx/gtk1/clipbrd.h
+    wx/gtk1/colour.h
+    wx/gtk1/cursor.h
+    wx/gtk1/dataform.h
+    wx/gtk1/dataobj.h
+    wx/gtk1/dataobj2.h
+    wx/gtk1/dc.h
+    wx/gtk1/dcclient.h
+    wx/gtk1/dcmemory.h
+    wx/gtk1/dcscreen.h
+    wx/gtk1/dnd.h
+    wx/gtk1/font.h
+    wx/gtk1/gdiobj.h
+    wx/gtk1/icon.h
+    wx/gtk1/minifram.h
+    wx/gtk1/pen.h
+    wx/gtk1/popupwin.h
+    wx/gtk1/region.h
+    wx/gtk1/timer.h
+    wx/gtk1/tooltip.h
+    wx/gtk1/toplevel.h
+    wx/gtk1/win_gtk.h
+    wx/gtk1/window.h
+</set>
+<set var="GTK1_SRC" hints="files">
+    <!-- Generic implementations used by wxGTK1: -->
+    src/generic/accel.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
+    <!-- Generic implementations used by wxGPE: -->
+    src/generic/fontdlgg.cpp
+    <!-- GTK1 specific files: -->
+    src/gtk1/bmpbuttn.cpp
+    src/gtk1/button.cpp
+    src/gtk1/checkbox.cpp
+    src/gtk1/checklst.cpp
+    src/gtk1/choice.cpp
+    src/gtk1/combobox.cpp
+    src/gtk1/control.cpp
+    src/gtk1/dialog.cpp
+    src/gtk1/filedlg.cpp
+    src/gtk1/fontdlg.cpp
+    src/gtk1/frame.cpp
+    src/gtk1/gauge.cpp
+    src/gtk1/listbox.cpp
+    src/gtk1/mdi.cpp
+    src/gtk1/menu.cpp
+    src/gtk1/notebook.cpp
+    src/gtk1/radiobox.cpp
+    src/gtk1/radiobut.cpp
+    src/gtk1/scrolbar.cpp
+    src/gtk1/scrolwin.cpp
+    src/gtk1/slider.cpp
+    src/gtk1/spinbutt.cpp
+    src/gtk1/spinctrl.cpp
+    src/gtk1/statbmp.cpp
+    src/gtk1/statbox.cpp
+    src/gtk1/statline.cpp
+    src/gtk1/stattext.cpp
+    src/gtk1/tbargtk.cpp
+    src/gtk1/textctrl.cpp
+    src/gtk1/tglbtn.cpp
+    src/gtk1/utilsres.cpp
+</set>
+<set var="GTK1_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/gtk1/accel.h
+    wx/gtk1/bmpbuttn.h
+    wx/gtk1/button.h
+    wx/gtk1/checkbox.h
+    wx/gtk1/checklst.h
+    wx/gtk1/choice.h
+    wx/gtk1/combobox.h
+    wx/gtk1/control.h
+    wx/gtk1/dialog.h
+    wx/gtk1/filedlg.h
+    wx/gtk1/fontdlg.h
+    wx/gtk1/frame.h
+    wx/gtk1/gauge.h
+    wx/gtk1/listbox.h
+    wx/gtk1/mdi.h
+    wx/gtk1/menu.h
+    wx/gtk1/menuitem.h
+    wx/gtk1/msgdlg.h
+    wx/gtk1/notebook.h
+    wx/gtk1/radiobox.h
+    wx/gtk1/radiobut.h
+    wx/gtk1/scrolbar.h
+    wx/gtk1/scrolwin.h
+    wx/gtk1/slider.h
+    wx/gtk1/spinbutt.h
+    wx/gtk1/spinctrl.h
+    wx/gtk1/statbmp.h
+    wx/gtk1/statbox.h
+    wx/gtk1/statline.h
+    wx/gtk1/stattext.h
+    wx/gtk1/tbargtk.h
+    wx/gtk1/textctrl.h
+    wx/gtk1/tglbtn.h
+    wx/gtk1/treectrl.h
 </set>
 
 
 </set>
 
 
@@ -1177,7 +1351,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/gdiobj.cpp
     src/x11/gsockx11.cpp
     src/x11/icon.cpp
     src/x11/gdiobj.cpp
     src/x11/gsockx11.cpp
     src/x11/icon.cpp
-    src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1388,7 +1561,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/minifram.h
     wx/msw/missing.h
     wx/msw/msgdlg.h
     wx/msw/minifram.h
     wx/msw/missing.h
     wx/msw/msgdlg.h
-    wx/msw/mslu.h
     wx/msw/msvcrt.h
     wx/msw/notebook.h
     wx/msw/ole/access.h
     wx/msw/msvcrt.h
     wx/msw/notebook.h
     wx/msw/ole/access.h
@@ -1402,12 +1574,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/pen.h
     wx/msw/printdlg.h
     wx/msw/printwin.h
     wx/msw/pen.h
     wx/msw/printdlg.h
     wx/msw/printwin.h
-    wx/msw/private.h
     wx/msw/radiobox.h
     wx/msw/radiobut.h
     wx/msw/radiobox.h
     wx/msw/radiobut.h
-    wx/msw/regconf.h
     wx/msw/region.h
     wx/msw/region.h
-    wx/msw/registry.h
     wx/msw/rcdefs.h
     wx/msw/scrolbar.h
     wx/msw/setup0.h
     wx/msw/rcdefs.h
     wx/msw/scrolbar.h
     wx/msw/setup0.h
@@ -1421,7 +1590,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/stattext.h
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
-    wx/msw/tbarmsw.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
     wx/msw/timer.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
     wx/msw/timer.h
@@ -1484,6 +1652,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="WINCE_SRC" hints="files">
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
 <set var="WINCE_SRC" hints="files">
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/checklst.cpp
     src/msw/wince/choicece.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/checklst.cpp
     src/msw/wince/choicece.cpp
@@ -1497,6 +1666,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
     wx/generic/fontdlgg.h
     wx/msw/wince/checklst.h
     wx/msw/wince/choicece.h
     wx/generic/fontdlgg.h
     wx/msw/wince/checklst.h
     wx/msw/wince/choicece.h
@@ -1613,7 +1783,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/dcprint.cpp
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
     src/os2/dcprint.cpp
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
-    src/os2/display.cpp
     src/os2/dnd.cpp
     src/os2/evtloop.cpp
     src/os2/filedlg.cpp
     src/os2/dnd.cpp
     src/os2/evtloop.cpp
     src/os2/filedlg.cpp
@@ -1695,7 +1864,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/dcprint.h
     wx/os2/dcscreen.h
     wx/os2/dialog.h
     wx/os2/dcprint.h
     wx/os2/dcscreen.h
     wx/os2/dialog.h
-    wx/os2/display.h
     wx/os2/dnd.h
     wx/os2/filedlg.h
     wx/os2/font.h
     wx/os2/dnd.h
     wx/os2/filedlg.h
     wx/os2/font.h
@@ -1719,7 +1887,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/pnghand.h
     wx/os2/pngread.h
     wx/os2/print.h
     wx/os2/pnghand.h
     wx/os2/pngread.h
     wx/os2/print.h
-    wx/os2/private.h
     wx/os2/radiobox.h
     wx/os2/radiobut.h
     wx/os2/region.h
     wx/os2/radiobox.h
     wx/os2/radiobut.h
     wx/os2/region.h
@@ -1892,7 +2059,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
-    wx/mac/display.h
     wx/mac/dnd.h
     wx/mac/evtloop.h
     wx/mac/filedlg.h
     wx/mac/dnd.h
     wx/mac/evtloop.h
     wx/mac/filedlg.h
@@ -1980,7 +2146,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/dcscreen.h
     wx/mac/carbon/dialog.h
     wx/mac/carbon/dirdlg.h
     wx/mac/carbon/dcscreen.h
     wx/mac/carbon/dialog.h
     wx/mac/carbon/dirdlg.h
-    wx/mac/carbon/display.h
     wx/mac/carbon/dnd.h
     wx/mac/carbon/evtloop.h
     wx/mac/carbon/filedlg.h
     wx/mac/carbon/dnd.h
     wx/mac/carbon/evtloop.h
     wx/mac/carbon/filedlg.h
@@ -2092,6 +2257,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
+    src/cocoa/dirdlg.mm
     src/cocoa/display.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
     src/cocoa/display.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
@@ -2137,7 +2303,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/accel.cpp
     src/generic/caret.cpp
     src/generic/colrdlgg.cpp
     src/generic/accel.cpp
     src/generic/caret.cpp
     src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
@@ -2186,7 +2351,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
-    wx/cocoa/display.h
+    wx/cocoa/dirdlg.h
     wx/cocoa/drawer.h
     wx/cocoa/filedlg.h
     wx/cocoa/font.h
     wx/cocoa/drawer.h
     wx/cocoa/filedlg.h
     wx/cocoa/font.h
@@ -2222,7 +2387,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
-    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
@@ -2348,7 +2512,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">
+    src/common/datavcmn.cpp
     src/generic/calctrl.cpp
     src/generic/calctrl.cpp
+    src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/datectlg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
@@ -2369,10 +2535,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
 
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/calctrl.h
+    wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/generic/calctrl.h
     wx/generic/datectrl.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/generic/calctrl.h
     wx/generic/datectrl.h
+    wx/generic/dataview.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
@@ -2401,6 +2569,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
     wx/datectrl.h
 
 <set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
     wx/datectrl.h
+    wx/dataview.h
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
@@ -2476,8 +2645,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_GTK_SRC" hints="files">
     src/gtk/taskbar.cpp
 
 <set var="ADVANCED_GTK_SRC" hints="files">
     src/gtk/taskbar.cpp
+    src/gtk/dataview.cpp
     src/gtk/eggtrayicon.c
 </set>
     src/gtk/eggtrayicon.c
 </set>
+<set var="ADVANCED_GTK1_SRC" hints="files">
+</set>
 
 <!-- ====================================================================== -->
 <!--                               wxMedia                                  -->
 
 <!-- ====================================================================== -->
 <!--                               wxMedia                                  -->
@@ -2492,7 +2664,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_MSW_SRC" hints="files">
 </set>
 
 <set var="MEDIA_MSW_SRC" hints="files">
-    src/msw/mediactrl.cpp
+    src/msw/mediactrl_am.cpp
+    src/msw/mediactrl_wmp10.cpp
     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
@@ -2530,6 +2703,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_GTK_SRC" hints="files">
 </set>
 
 <set var="MEDIA_GTK_SRC" hints="files">
 </set>
 
+<set var="MEDIA_GTK1_SRC" hints="files">
+</set>
+
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
@@ -2718,7 +2894,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OPENGL_SRC" hints="files">
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
 <set var="OPENGL_SRC" hints="files">
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
-    <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
@@ -2729,7 +2906,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
@@ -2866,7 +3044,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- GUI sources: -->
 
     <set var="LOWLEVEL_SRC" hints="files">
     <!-- GUI sources: -->
 
     <set var="LOWLEVEL_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(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>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
@@ -2877,7 +3056,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(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>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
@@ -2889,7 +3069,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
 
     <set var="GUI_SRC" hints="files">
     </set>
 
     <set var="GUI_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(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>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
@@ -2898,7 +3079,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=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(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>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
@@ -2923,7 +3105,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(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=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
wxWidgets (Impactor)