X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e32f486958289a3d61813669d52f4bee68df2f91..f4998a1cc6cf4783a46fbeee4e75a0808b8afe21:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 11ccec8d77..e39e4594cf 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -7,8 +7,8 @@
 IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 -->
-    
-    
+
+
 <!-- ======================================================================
                                        FILES
 
@@ -109,10 +109,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/mimetmac.cpp
     src/unix/baseunix.cpp
     src/mac/utilsexc.cpp
+    src/mac/thread.cpp
+    src/mac/macnotfy.cpp
+    src/mac/morefilex/MoreFilesX.c
 </set>
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/utils.cpp
+    src/mac/uma.cpp
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
@@ -120,6 +124,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
+    src/os2/mimetype.cpp
+    src/os2/thread.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
@@ -149,6 +155,7 @@ 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
@@ -177,6 +184,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
+    src/common/xti.cpp
+    src/common/xtistrm.cpp
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
@@ -187,6 +196,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR" hints="files">
+    wx/afterstd.h
     wx/app.h
     wx/apptrait.h
     wx/arrimpl.cpp
@@ -212,6 +222,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dynload.h
     wx/encconv.h
     wx/event.h
+    wx/except.h
     wx/features.h
     wx/ffile.h
     wx/file.h
@@ -223,6 +234,7 @@ 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
@@ -255,6 +267,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/regex.h
     wx/scopeguard.h
     wx/snglinst.h
+    wx/stack.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
@@ -277,6 +290,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wx.h
     wx/wxchar.h
     wx/wxprec.h
+    wx/xti.h
+    wx/xtistrm.h
     wx/zipstrm.h
     wx/zstream.h
 </set>
@@ -315,8 +330,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="NET_OS2_SRC" hints="files">
+    src/os2/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
+    wx/unix/gsockunx.h
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -357,6 +374,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
+    src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/cmdproc.cpp
@@ -428,6 +446,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
+    src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
@@ -438,7 +457,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp
-    src/generic/tbarsmpl.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/treectlg.cpp
@@ -466,6 +484,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h
+    wx/encinfo.h
     wx/filedlg.h
     wx/frame.h
     wx/gauge.h
@@ -525,9 +544,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     wx/accel.h
     wx/access.h
-    wx/afterstd.h
     wx/artprov.h
     wx/bitmap.h
+    wx/bookctrl.h
     wx/busyinfo.h
     wx/caret.h
     wx/clipbrd.h
@@ -572,6 +591,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h
+    wx/listbook.h
     wx/listctrl.h
     wx/matrix.h
     wx/menuitem.h
@@ -593,12 +613,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
-    wx/stack.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
     wx/tbarbase.h
-    wx/tbarsmpl.h
     wx/tglbtn.h
     wx/tipwin.h
     wx/tooltip.h
@@ -606,6 +624,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/treebase.h
     wx/treectrl.h
     wx/valgen.h
+    wx/vidmode.h
     wx/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
@@ -658,6 +677,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gsockgtk.c
     src/gtk/icon.cpp
     src/gtk/main.cpp
+    src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/region.cpp
@@ -702,7 +722,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
-    src/gtk/minifram.cpp
     src/gtk/msgdlg.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
@@ -804,6 +823,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/x11/bitmap.h
+    wx/x11/brush.h
+    wx/x11/pen.h
+    wx/x11/region.h
 </set>
 <set var="MOTIF_SRC" hints="files">
     src/motif/accel.cpp
@@ -858,6 +881,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/toplevel.cpp
     src/motif/utils.cpp
     src/motif/window.cpp
+    src/motif/xmcombo/xmcombo.c
     <!-- Generic files used by wxMotif: -->
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
@@ -924,7 +948,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/radiobut.h
     wx/motif/region.h
     wx/motif/scrolbar.h
-    wx/motif/settings.h
     wx/motif/slider.h
     wx/motif/spinbutt.h
     wx/motif/statbmp.h
@@ -980,7 +1003,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
-    src/generic/timer.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
@@ -1073,6 +1095,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
+    src/generic/prntdlgg.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1326,7 +1349,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="OS2_SRC" hints="files">
+    <!-- Generic implementations used by wxOS2: -->
     src/generic/caret.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/imaglist.cpp
+    src/generic/mdig.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
+    <!-- OS/2 specific files: -->
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
@@ -1350,6 +1383,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
     src/os2/dnd.cpp
+    src/os2/evtloop.cpp
     src/os2/filedlg.cpp
     src/os2/font.cpp
     src/os2/fontdlg.cpp
@@ -1359,17 +1393,16 @@ 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/gsocket.c
     src/os2/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
     src/os2/listbox.cpp
+    src/os2/listctrl.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp
-    src/os2/mimetype.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -1391,15 +1424,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
-    src/os2/thread.cpp
     src/os2/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
+    src/os2/treectrl.cpp
+    src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h
+    wx/generic/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/mdig.h
+    wx/generic/statusbr.h
     wx/os2/accel.h
     wx/os2/app.h
     wx/os2/bitmap.h
@@ -1431,11 +1470,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/gauge.h
     wx/os2/gdiimage.h
     wx/os2/gdiobj.h
-    wx/os2/gsockos2.h
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
     wx/os2/listbox.h
+    wx/os2/listctrl.h
     wx/os2/menu.h
     wx/os2/menuitem.h
     wx/os2/metafile.h
@@ -1467,6 +1506,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
+    wx/msw/treectrl.h
     wx/os2/window.h
 </set>
 
@@ -1517,13 +1557,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/gdiobj.cpp
     src/mac/icon.cpp
     src/mac/listbox.cpp
-    src/mac/macnotfy.cpp
     src/mac/mdi.cpp
     src/mac/menu.cpp
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
     src/mac/minifram.cpp
-    src/mac/morefilex/MoreFilesX.c
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
     src/mac/palette.cpp
@@ -1546,12 +1584,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/stattext.cpp
     src/mac/tabctrl.cpp
     src/mac/textctrl.cpp
-    src/mac/thread.cpp
     src/mac/timer.cpp
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/toplevel.cpp
-    src/mac/uma.cpp
     src/mac/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
@@ -1559,6 +1595,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
@@ -1668,6 +1705,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/NSTableView.mm
     src/cocoa/NSTextField.mm
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
@@ -1700,6 +1738,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/icon.cpp
     src/cocoa/listbox.mm
     src/cocoa/main.cpp
+    src/cocoa/mbarman.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
     src/cocoa/pen.mm
@@ -1742,6 +1781,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/NSTableView.h
     wx/cocoa/NSTextField.h
     wx/cocoa/NSView.h
     wx/cocoa/NSWindow.h
@@ -1774,6 +1814,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/mbarman.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
     wx/cocoa/pen.h
@@ -2056,9 +2097,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XML_SRC" hints="files">
     src/xml/xml.cpp
+    src/common/xtixml.cpp <!-- FIXME - temporary solution -->
 </set>
 <set var="XML_HDR" hints="files">
     wx/xml/xml.h
+    wx/xtixml.h <!-- FIXME - temporary solution -->
 </set>
 
 
@@ -2070,16 +2113,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
-    <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
     <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
+    <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>
 
 
@@ -2124,6 +2169,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
@@ -2147,8 +2193,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
     </set>
-    
-    
+
+
     <!-- wxNet files: -->
     <set var="NET_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
@@ -2160,10 +2206,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+        <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
+        <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
     </set>
@@ -2174,14 +2222,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
     <!-- GUI sources: -->
-    
+
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_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>
     </set>
@@ -2191,18 +2239,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_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>
     </set>
-    
+
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
@@ -2210,7 +2258,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
     </set>
 
     <set var="CORE_SRC" hints="files">
@@ -2221,7 +2269,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
-    
+
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
@@ -2229,7 +2277,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
@@ -2237,7 +2285,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
     <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
     <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
@@ -2255,15 +2303,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR)
         </if>
     </set>
-        
+
 
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(XML_HDR)
+        $(XML_HDR) $(ODBC_HDR)
     </set>
 
     <set var="ALL_HEADERS" make_var="1" hints="files">
@@ -2280,7 +2328,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_DARWIN_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
-        $(XML_SRC)
+        $(XML_SRC) $(ODBC_SRC)
     </set>
 
 </makefile>