diff --git a/Makefile.in b/Makefile.in
index 8471ed3ee7..38523ff8f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,7 +102,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__basedll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__basedll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__basedll___targetsuf2 = .0.$(SO_SUFFIX)
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p_1 = -lwxodbc
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p_2 = -lwxodbc
@@ -507,7 +507,14 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_COCOA@    wx/cocoa/stattext.h \
 @COND_TOOLKIT_COCOA@    wx/cocoa/textctrl.h \
 @COND_TOOLKIT_COCOA@    wx/cocoa/toplevel.h \
-@COND_TOOLKIT_COCOA@    wx/cocoa/window.h
+@COND_TOOLKIT_COCOA@    wx/cocoa/window.h \
+@COND_TOOLKIT_COCOA@     \
+@COND_TOOLKIT_COCOA@    wx/generic/statusbr.h \
+@COND_TOOLKIT_COCOA@    wx/generic/fontdlgg.h \
+@COND_TOOLKIT_COCOA@    wx/generic/imaglist.h \
+@COND_TOOLKIT_COCOA@    wx/generic/listctrl.h \
+@COND_TOOLKIT_COCOA@    wx/generic/fdrepdlg.h \
+@COND_TOOLKIT_COCOA@    wx/generic/tabg.h
 @COND_TOOLKIT_OS2@GUI_HDR = wx/os2/accel.h \
 @COND_TOOLKIT_OS2@    wx/os2/dataobj.h \
 @COND_TOOLKIT_OS2@    wx/os2/helpwin.h \
@@ -908,7 +915,17 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_COCOA@    src/cocoa/toplevel.mm \
 @COND_TOOLKIT_COCOA@    src/cocoa/utils.cpp \
 @COND_TOOLKIT_COCOA@    src/cocoa/utilsexc.cpp \
-@COND_TOOLKIT_COCOA@    src/cocoa/window.mm
+@COND_TOOLKIT_COCOA@    src/cocoa/window.mm \
+@COND_TOOLKIT_COCOA@     \
+@COND_TOOLKIT_COCOA@    src/generic/statusbr.cpp \
+@COND_TOOLKIT_COCOA@    src/generic/imaglist.cpp \
+@COND_TOOLKIT_COCOA@    src/generic/listctrl.cpp \
+@COND_TOOLKIT_COCOA@    src/generic/fdrepdlg.cpp \
+@COND_TOOLKIT_COCOA@    src/generic/tabg.cpp \
+@COND_TOOLKIT_COCOA@    src/generic/fontdlgg.cpp \
+@COND_TOOLKIT_COCOA@     \
+@COND_TOOLKIT_COCOA@    src/unix/snglinst.cpp \
+@COND_TOOLKIT_COCOA@    src/unix/utilsunx.cpp
 @COND_TOOLKIT_OS2@GUI_SRC = src/os2/accel.cpp \
 @COND_TOOLKIT_OS2@    src/os2/app.cpp \
 @COND_TOOLKIT_OS2@    src/os2/bitmap.cpp \
@@ -1000,7 +1017,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = coredll-gsockmot.o coredll-accel1.o coredll-app4.o coredll-bmpbuttn1.o coredll-bmpmotif.o coredll-button1.o coredll-checkbox1.o coredll-checklst1.o coredll-choice1.o coredll-clipbrd4.o coredll-colour4.o coredll-combobox1.o coredll-combobox_native.o coredll-control1.o coredll-cursor4.o coredll-data4.o coredll-dataobj3.o coredll-dc4.o coredll-dcclient4.o coredll-dcmemory4.o coredll-dcscreen4.o coredll-dialog1.o coredll-evtloop4.o coredll-filedlg.o coredll-font4.o coredll-frame1.o coredll-gauge1.o coredll-gdiobj4.o coredll-glcanvas2.o coredll-icon4.o coredll-listbox1.o coredll-main2.o coredll-mdi1.o coredll-menu1.o coredll-menuitem.o coredll-minifram3.o coredll-msgdlg1.o coredll-palette3.o coredll-radiobox1.o coredll-radiobut1.o coredll-scrolbar1.o coredll-settings4.o coredll-slider1.o coredll-spinbutt1.o coredll-statbmp1.o coredll-statbox1.o coredll-stattext1.o coredll-toolbar.o coredll-textctrl1.o coredll-timer3.o coredll-toplevel4.o coredll-utils2.o coredll-window4.o coredll-fdrepdlg.o coredll-listctrl.o coredll-imaglist.o coredll-notebook1.o coredll-fontdlgg.o coredll-colrdlgg.o coredll-statline1.o coredll-tabg.o coredll-dirdlgg.o coredll-prntdlgg.o coredll-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = coredll-access.o coredll-accel2.o coredll-bmpbuttn2.o coredll-button2.o coredll-checkbox2.o coredll-checklst2.o coredll-choice2.o coredll-colordlg.o coredll-combobox2.o coredll-control2.o coredll-dialog2.o coredll-dragimag.o coredll-fdrepdlg1.o coredll-filedlg1.o coredll-fontdlg1.o coredll-frame2.o coredll-gauge95.o coredll-imaglist1.o coredll-iniconf.o coredll-listbox2.o coredll-listctrl1.o coredll-mdi2.o coredll-menu2.o coredll-menuitem1.o coredll-metafile.o coredll-msgdlg2.o coredll-nativdlg.o coredll-notebook2.o coredll-ownerdrw.o coredll-penwin.o coredll-printdlg.o coredll-printwin.o coredll-radiobox2.o coredll-radiobut2.o coredll-scrolbar2.o coredll-slider95.o coredll-spinbutt2.o coredll-spinctrl1.o coredll-statbmp2.o coredll-statbox2.o coredll-statbr95.o coredll-statline2.o coredll-stattext2.o coredll-tabctrl.o coredll-tbar95.o coredll-textctrl2.o coredll-tglbtn1.o coredll-treectrl.o coredll-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = coredll-gsocket.o coredll-accel3.o coredll-aga.o coredll-app5.o coredll-bitmap4.o coredll-bmpbuttn3.o coredll-brush4.o coredll-button3.o coredll-checkbox3.o coredll-checklst3.o coredll-choice3.o coredll-clipbrd5.o coredll-colordlg1.o coredll-colour5.o coredll-combobox3.o coredll-control3.o coredll-cursor5.o coredll-data5.o coredll-dataobj4.o coredll-dc5.o coredll-dcclient5.o coredll-dcmemory5.o coredll-dcprint1.o coredll-dcscreen5.o coredll-dialog3.o coredll-dirdlg1.o coredll-dirmac.o coredll-dnd1.o coredll-filedlg2.o coredll-font5.o coredll-fontdlg2.o coredll-fontenum3.o coredll-fontutil3.o coredll-frame3.o coredll-gauge2.o coredll-gdiobj5.o coredll-icon5.o coredll-joystick3.o coredll-listbox3.o coredll-macnotfy.o coredll-mdi3.o coredll-menu3.o coredll-menuitem2.o coredll-metafile1.o coredll-mimetmac.o coredll-minifram4.o coredll-msgdlg3.o coredll-notebmac.o coredll-palette4.o coredll-pen4.o coredll-pnghand.o coredll-printdlg1.o coredll-printmac.o coredll-radiobox3.o coredll-radiobut3.o coredll-region4.o coredll-scrolbar3.o coredll-settings5.o coredll-slider2.o coredll-spinbutt3.o coredll-statbmp3.o coredll-statbox3.o coredll-statbrma.o coredll-statlmac.o coredll-stattext3.o coredll-tabctrl1.o coredll-textctrl3.o coredll-thread.o coredll-timer4.o coredll-toplevel5.o coredll-toolbar1.o coredll-tooltip2.o coredll-uma.o coredll-utils3.o coredll-utilsexc.o coredll-wave2.o coredll-window5.o coredll-MoreFilesX.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o coredll-utilsunx.o
-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = coredll-NSBox.o coredll-NSButton.o coredll-NSControl.o coredll-NSMenu.o coredll-NSPanel.o coredll-NSTextField.o coredll-NSView.o coredll-NSWindow.o coredll-app6.o coredll-bmpbuttn4.o coredll-bitmap5.o coredll-brush5.o coredll-button4.o coredll-checkbox4.o coredll-checklst4.o coredll-choice4.o coredll-colour6.o coredll-control4.o coredll-cursor6.o coredll-data6.o coredll-dc6.o coredll-dcclient6.o coredll-dcmemory6.o coredll-dcscreen6.o coredll-dialog4.o coredll-font6.o coredll-fontutil4.o coredll-frame4.o coredll-gdiobj6.o coredll-icon6.o coredll-listbox4.o coredll-main3.o coredll-menu4.o coredll-menuitem3.o coredll-pen5.o coredll-radiobox4.o coredll-radiobut4.o coredll-region5.o coredll-settings6.o coredll-slider3.o coredll-statbmp4.o coredll-statbox4.o coredll-statline21.o coredll-stattext4.o coredll-textctrl4.o coredll-toplevel6.o coredll-utils4.o coredll-utilsexc1.o coredll-window6.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = coredll-NSBox.o coredll-NSButton.o coredll-NSControl.o coredll-NSMenu.o coredll-NSPanel.o coredll-NSTextField.o coredll-NSView.o coredll-NSWindow.o coredll-app6.o coredll-bmpbuttn4.o coredll-bitmap5.o coredll-brush5.o coredll-button4.o coredll-checkbox4.o coredll-checklst4.o coredll-choice4.o coredll-colour6.o coredll-control4.o coredll-cursor6.o coredll-data6.o coredll-dc6.o coredll-dcclient6.o coredll-dcmemory6.o coredll-dcscreen6.o coredll-dialog4.o coredll-font6.o coredll-fontutil4.o coredll-frame4.o coredll-gdiobj6.o coredll-icon6.o coredll-listbox4.o coredll-main3.o coredll-menu4.o coredll-menuitem3.o coredll-pen5.o coredll-radiobox4.o coredll-radiobut4.o coredll-region5.o coredll-settings6.o coredll-slider3.o coredll-statbmp4.o coredll-statbox4.o coredll-statline21.o coredll-stattext4.o coredll-textctrl4.o coredll-toplevel6.o coredll-utils4.o coredll-utilsexc1.o coredll-window6.o coredll-statusbr.o coredll-imaglist.o coredll-listctrl.o coredll-fdrepdlg.o coredll-tabg.o coredll-fontdlgg.o coredll-snglinst.o coredll-utilsunx.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = coredll-accel4.o coredll-app7.o coredll-bitmap6.o coredll-bmpbuttn5.o coredll-brush6.o coredll-button5.o coredll-checkbox5.o coredll-checklst5.o coredll-choice5.o coredll-clipbrd6.o coredll-colour7.o coredll-combobox4.o coredll-control5.o coredll-cursor7.o coredll-data7.o coredll-dataobj5.o coredll-dc7.o coredll-dcclient7.o coredll-dcmemory7.o coredll-dcprint2.o coredll-dcscreen7.o coredll-dialog5.o coredll-dnd2.o coredll-filedlg3.o coredll-font7.o coredll-fontdlg3.o coredll-fontenum4.o coredll-fontutil5.o coredll-frame5.o coredll-gauge3.o coredll-gdiimage1.o coredll-gdiobj7.o coredll-helpwin1.o coredll-icon7.o coredll-iniconf1.o coredll-joystick4.o coredll-listbox5.o coredll-main4.o coredll-menu5.o coredll-menuitem4.o coredll-metafile2.o coredll-mimetype.o coredll-msgdlg4.o coredll-nativdlg1.o coredll-notebook3.o coredll-ownerdrw1.o coredll-palette5.o coredll-pen6.o coredll-print.o coredll-radiobox5.o coredll-radiobut5.o coredll-region6.o coredll-scrolbar4.o coredll-settings7.o coredll-slider4.o coredll-spinbutt4.o coredll-spinctrl2.o coredll-statbmp5.o coredll-statbox5.o coredll-statline3.o coredll-stattext5.o coredll-tabctrl2.o coredll-textctrl5.o coredll-timer5.o coredll-thread1.o coredll-toolbar2.o coredll-tooltip3.o coredll-toplevel7.o coredll-wave3.o coredll-window7.o coredll-gsocket1.o coredll-gsockpm.o
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
 @COND_SHARED_0_MONOLITHIC_1@__install_monolib___depname = install_monolib
@@ -1541,14 +1558,14 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = corelib-gsockmot.o corelib-accel1.o corelib-app4.o corelib-bmpbuttn1.o corelib-bmpmotif.o corelib-button1.o corelib-checkbox1.o corelib-checklst1.o corelib-choice1.o corelib-clipbrd4.o corelib-colour4.o corelib-combobox1.o corelib-combobox_native.o corelib-control1.o corelib-cursor4.o corelib-data4.o corelib-dataobj3.o corelib-dc4.o corelib-dcclient4.o corelib-dcmemory4.o corelib-dcscreen4.o corelib-dialog1.o corelib-evtloop4.o corelib-filedlg.o corelib-font4.o corelib-frame1.o corelib-gauge1.o corelib-gdiobj4.o corelib-glcanvas2.o corelib-icon4.o corelib-listbox1.o corelib-main2.o corelib-mdi1.o corelib-menu1.o corelib-menuitem.o corelib-minifram3.o corelib-msgdlg1.o corelib-palette3.o corelib-radiobox1.o corelib-radiobut1.o corelib-scrolbar1.o corelib-settings4.o corelib-slider1.o corelib-spinbutt1.o corelib-statbmp1.o corelib-statbox1.o corelib-stattext1.o corelib-toolbar.o corelib-textctrl1.o corelib-timer3.o corelib-toplevel4.o corelib-utils2.o corelib-window4.o corelib-fdrepdlg.o corelib-listctrl.o corelib-imaglist.o corelib-notebook1.o corelib-fontdlgg.o corelib-colrdlgg.o corelib-statline1.o corelib-tabg.o corelib-dirdlgg.o corelib-prntdlgg.o corelib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = corelib-access.o corelib-accel2.o corelib-bmpbuttn2.o corelib-button2.o corelib-checkbox2.o corelib-checklst2.o corelib-choice2.o corelib-colordlg.o corelib-combobox2.o corelib-control2.o corelib-dialog2.o corelib-dragimag.o corelib-fdrepdlg1.o corelib-filedlg1.o corelib-fontdlg1.o corelib-frame2.o corelib-gauge95.o corelib-imaglist1.o corelib-iniconf.o corelib-listbox2.o corelib-listctrl1.o corelib-mdi2.o corelib-menu2.o corelib-menuitem1.o corelib-metafile.o corelib-msgdlg2.o corelib-nativdlg.o corelib-notebook2.o corelib-ownerdrw.o corelib-penwin.o corelib-printdlg.o corelib-printwin.o corelib-radiobox2.o corelib-radiobut2.o corelib-scrolbar2.o corelib-slider95.o corelib-spinbutt2.o corelib-spinctrl1.o corelib-statbmp2.o corelib-statbox2.o corelib-statbr95.o corelib-statline2.o corelib-stattext2.o corelib-tabctrl.o corelib-tbar95.o corelib-textctrl2.o corelib-tglbtn1.o corelib-treectrl.o corelib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = corelib-gsocket.o corelib-accel3.o corelib-aga.o corelib-app5.o corelib-bitmap4.o corelib-bmpbuttn3.o corelib-brush4.o corelib-button3.o corelib-checkbox3.o corelib-checklst3.o corelib-choice3.o corelib-clipbrd5.o corelib-colordlg1.o corelib-colour5.o corelib-combobox3.o corelib-control3.o corelib-cursor5.o corelib-data5.o corelib-dataobj4.o corelib-dc5.o corelib-dcclient5.o corelib-dcmemory5.o corelib-dcprint1.o corelib-dcscreen5.o corelib-dialog3.o corelib-dirdlg1.o corelib-dirmac.o corelib-dnd1.o corelib-filedlg2.o corelib-font5.o corelib-fontdlg2.o corelib-fontenum3.o corelib-fontutil3.o corelib-frame3.o corelib-gauge2.o corelib-gdiobj5.o corelib-icon5.o corelib-joystick3.o corelib-listbox3.o corelib-macnotfy.o corelib-mdi3.o corelib-menu3.o corelib-menuitem2.o corelib-metafile1.o corelib-mimetmac.o corelib-minifram4.o corelib-msgdlg3.o corelib-notebmac.o corelib-palette4.o corelib-pen4.o corelib-pnghand.o corelib-printdlg1.o corelib-printmac.o corelib-radiobox3.o corelib-radiobut3.o corelib-region4.o corelib-scrolbar3.o corelib-settings5.o corelib-slider2.o corelib-spinbutt3.o corelib-statbmp3.o corelib-statbox3.o corelib-statbrma.o corelib-statlmac.o corelib-stattext3.o corelib-tabctrl1.o corelib-textctrl3.o corelib-thread.o corelib-timer4.o corelib-toplevel5.o corelib-toolbar1.o corelib-tooltip2.o corelib-uma.o corelib-utils3.o corelib-utilsexc.o corelib-wave2.o corelib-window5.o corelib-MoreFilesX.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o corelib-utilsunx.o
-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = corelib-NSBox.o corelib-NSButton.o corelib-NSControl.o corelib-NSMenu.o corelib-NSPanel.o corelib-NSTextField.o corelib-NSView.o corelib-NSWindow.o corelib-app6.o corelib-bmpbuttn4.o corelib-bitmap5.o corelib-brush5.o corelib-button4.o corelib-checkbox4.o corelib-checklst4.o corelib-choice4.o corelib-colour6.o corelib-control4.o corelib-cursor6.o corelib-data6.o corelib-dc6.o corelib-dcclient6.o corelib-dcmemory6.o corelib-dcscreen6.o corelib-dialog4.o corelib-font6.o corelib-fontutil4.o corelib-frame4.o corelib-gdiobj6.o corelib-icon6.o corelib-listbox4.o corelib-main3.o corelib-menu4.o corelib-menuitem3.o corelib-pen5.o corelib-radiobox4.o corelib-radiobut4.o corelib-region5.o corelib-settings6.o corelib-slider3.o corelib-statbmp4.o corelib-statbox4.o corelib-statline21.o corelib-stattext4.o corelib-textctrl4.o corelib-toplevel6.o corelib-utils4.o corelib-utilsexc1.o corelib-window6.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = corelib-NSBox.o corelib-NSButton.o corelib-NSControl.o corelib-NSMenu.o corelib-NSPanel.o corelib-NSTextField.o corelib-NSView.o corelib-NSWindow.o corelib-app6.o corelib-bmpbuttn4.o corelib-bitmap5.o corelib-brush5.o corelib-button4.o corelib-checkbox4.o corelib-checklst4.o corelib-choice4.o corelib-colour6.o corelib-control4.o corelib-cursor6.o corelib-data6.o corelib-dc6.o corelib-dcclient6.o corelib-dcmemory6.o corelib-dcscreen6.o corelib-dialog4.o corelib-font6.o corelib-fontutil4.o corelib-frame4.o corelib-gdiobj6.o corelib-icon6.o corelib-listbox4.o corelib-main3.o corelib-menu4.o corelib-menuitem3.o corelib-pen5.o corelib-radiobox4.o corelib-radiobut4.o corelib-region5.o corelib-settings6.o corelib-slider3.o corelib-statbmp4.o corelib-statbox4.o corelib-statline21.o corelib-stattext4.o corelib-textctrl4.o corelib-toplevel6.o corelib-utils4.o corelib-utilsexc1.o corelib-window6.o corelib-statusbr.o corelib-imaglist.o corelib-listctrl.o corelib-fdrepdlg.o corelib-tabg.o corelib-fontdlgg.o corelib-snglinst.o corelib-utilsunx.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = corelib-accel4.o corelib-app7.o corelib-bitmap6.o corelib-bmpbuttn5.o corelib-brush6.o corelib-button5.o corelib-checkbox5.o corelib-checklst5.o corelib-choice5.o corelib-clipbrd6.o corelib-colour7.o corelib-combobox4.o corelib-control5.o corelib-cursor7.o corelib-data7.o corelib-dataobj5.o corelib-dc7.o corelib-dcclient7.o corelib-dcmemory7.o corelib-dcprint2.o corelib-dcscreen7.o corelib-dialog5.o corelib-dnd2.o corelib-filedlg3.o corelib-font7.o corelib-fontdlg3.o corelib-fontenum4.o corelib-fontutil5.o corelib-frame5.o corelib-gauge3.o corelib-gdiimage1.o corelib-gdiobj7.o corelib-helpwin1.o corelib-icon7.o corelib-iniconf1.o corelib-joystick4.o corelib-listbox5.o corelib-main4.o corelib-menu5.o corelib-menuitem4.o corelib-metafile2.o corelib-mimetype.o corelib-msgdlg4.o corelib-nativdlg1.o corelib-notebook3.o corelib-ownerdrw1.o corelib-palette5.o corelib-pen6.o corelib-print.o corelib-radiobox5.o corelib-radiobut5.o corelib-region6.o corelib-scrolbar4.o corelib-settings7.o corelib-slider4.o corelib-spinbutt4.o corelib-spinctrl2.o corelib-statbmp5.o corelib-statbox5.o corelib-statline3.o corelib-stattext5.o corelib-tabctrl2.o corelib-textctrl5.o corelib-timer5.o corelib-thread1.o corelib-toolbar2.o corelib-tooltip3.o corelib-toplevel7.o corelib-wave3.o corelib-window7.o corelib-gsocket1.o corelib-gsockpm.o
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_LIBR = $(top_builddir)lib/libwxjpeg.a
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_1 = monolib-imaglist.o monolib-colrdlgg.o monolib-listctrl.o monolib-filedlgg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-accel.o monolib-msgdlgg.o monolib-fdrepdlg.o monolib-tabg.o monolib-statusbr.o monolib-bmpbuttn.o monolib-button.o monolib-checkbox.o monolib-checklst.o monolib-choice.o monolib-combobox.o monolib-control.o monolib-dialog.o monolib-fontdlg.o monolib-frame.o monolib-gauge.o monolib-joystick2.o monolib-listbox.o monolib-mdi.o monolib-menu.o monolib-minifram2.o monolib-msgdlg.o monolib-notebook.o monolib-radiobox.o monolib-radiobut.o monolib-scrolbar.o monolib-scrolwin.o monolib-slider.o monolib-spinbutt.o monolib-spinctrl.o monolib-statbmp.o monolib-statbox.o monolib-statline.o monolib-stattext.o monolib-tbargtk.o monolib-textctrl.o monolib-tglbtn.o monolib-utilsres.o monolib-wave1.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = monolib-gsockmot.o monolib-accel1.o monolib-app4.o monolib-bmpbuttn1.o monolib-bmpmotif.o monolib-button1.o monolib-checkbox1.o monolib-checklst1.o monolib-choice1.o monolib-clipbrd4.o monolib-colour4.o monolib-combobox1.o monolib-combobox_native.o monolib-control1.o monolib-cursor4.o monolib-data4.o monolib-dataobj3.o monolib-dc4.o monolib-dcclient4.o monolib-dcmemory4.o monolib-dcscreen4.o monolib-dialog1.o monolib-evtloop4.o monolib-filedlg.o monolib-font4.o monolib-frame1.o monolib-gauge1.o monolib-gdiobj4.o monolib-glcanvas2.o monolib-icon4.o monolib-listbox1.o monolib-main3.o monolib-mdi1.o monolib-menu1.o monolib-menuitem.o monolib-minifram3.o monolib-msgdlg1.o monolib-palette3.o monolib-radiobox1.o monolib-radiobut1.o monolib-scrolbar1.o monolib-settings4.o monolib-slider1.o monolib-spinbutt1.o monolib-statbmp1.o monolib-statbox1.o monolib-stattext1.o monolib-toolbar.o monolib-textctrl1.o monolib-timer3.o monolib-toplevel4.o monolib-utils3.o monolib-window4.o monolib-fdrepdlg.o monolib-listctrl.o monolib-imaglist.o monolib-notebook1.o monolib-fontdlgg.o monolib-colrdlgg.o monolib-statline1.o monolib-tabg.o monolib-dirdlgg.o monolib-prntdlgg.o monolib-statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = monolib-access.o monolib-accel2.o monolib-bmpbuttn2.o monolib-button2.o monolib-checkbox2.o monolib-checklst2.o monolib-choice2.o monolib-colordlg.o monolib-combobox2.o monolib-control2.o monolib-dialog2.o monolib-dragimag.o monolib-fdrepdlg1.o monolib-filedlg1.o monolib-fontdlg1.o monolib-frame2.o monolib-gauge95.o monolib-imaglist1.o monolib-iniconf.o monolib-listbox2.o monolib-listctrl1.o monolib-mdi2.o monolib-menu2.o monolib-menuitem1.o monolib-metafile.o monolib-msgdlg2.o monolib-nativdlg.o monolib-notebook2.o monolib-ownerdrw.o monolib-penwin.o monolib-printdlg.o monolib-printwin.o monolib-radiobox2.o monolib-radiobut2.o monolib-scrolbar2.o monolib-slider95.o monolib-spinbutt2.o monolib-spinctrl1.o monolib-statbmp2.o monolib-statbox2.o monolib-statbr95.o monolib-statline2.o monolib-stattext2.o monolib-tabctrl.o monolib-tbar95.o monolib-textctrl2.o monolib-tglbtn1.o monolib-treectrl.o monolib-mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = monolib-gsocket2.o monolib-accel3.o monolib-aga.o monolib-app5.o monolib-bitmap4.o monolib-bmpbuttn3.o monolib-brush4.o monolib-button3.o monolib-checkbox3.o monolib-checklst3.o monolib-choice3.o monolib-clipbrd5.o monolib-colordlg1.o monolib-colour5.o monolib-combobox3.o monolib-control3.o monolib-cursor5.o monolib-data5.o monolib-dataobj4.o monolib-dc5.o monolib-dcclient5.o monolib-dcmemory5.o monolib-dcprint1.o monolib-dcscreen5.o monolib-dialog3.o monolib-dirdlg1.o monolib-dirmac.o monolib-dnd1.o monolib-filedlg2.o monolib-font5.o monolib-fontdlg2.o monolib-fontenum3.o monolib-fontutil3.o monolib-frame3.o monolib-gauge2.o monolib-gdiobj5.o monolib-icon5.o monolib-joystick3.o monolib-listbox3.o monolib-macnotfy.o monolib-mdi3.o monolib-menu3.o monolib-menuitem2.o monolib-metafile1.o monolib-mimetmac.o monolib-minifram4.o monolib-msgdlg3.o monolib-notebmac.o monolib-palette4.o monolib-pen4.o monolib-pnghand.o monolib-printdlg1.o monolib-printmac.o monolib-radiobox3.o monolib-radiobut3.o monolib-region4.o monolib-scrolbar3.o monolib-settings5.o monolib-slider2.o monolib-spinbutt3.o monolib-statbmp3.o monolib-statbox3.o monolib-statbrma.o monolib-statlmac.o monolib-stattext3.o monolib-tabctrl1.o monolib-textctrl3.o monolib-thread1.o monolib-timer4.o monolib-toplevel5.o monolib-toolbar1.o monolib-tooltip2.o monolib-uma.o monolib-utils4.o monolib-utilsexc1.o monolib-wave2.o monolib-window5.o monolib-MoreFilesX.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o monolib-utilsunx.o
-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = monolib-NSBox.o monolib-NSButton.o monolib-NSControl.o monolib-NSMenu.o monolib-NSPanel.o monolib-NSTextField.o monolib-NSView.o monolib-NSWindow.o monolib-app6.o monolib-bmpbuttn4.o monolib-bitmap5.o monolib-brush5.o monolib-button4.o monolib-checkbox4.o monolib-checklst4.o monolib-choice4.o monolib-colour6.o monolib-control4.o monolib-cursor6.o monolib-data6.o monolib-dc6.o monolib-dcclient6.o monolib-dcmemory6.o monolib-dcscreen6.o monolib-dialog4.o monolib-font6.o monolib-fontutil4.o monolib-frame4.o monolib-gdiobj6.o monolib-icon6.o monolib-listbox4.o monolib-main4.o monolib-menu4.o monolib-menuitem3.o monolib-pen5.o monolib-radiobox4.o monolib-radiobut4.o monolib-region5.o monolib-settings6.o monolib-slider3.o monolib-statbmp4.o monolib-statbox4.o monolib-statline21.o monolib-stattext4.o monolib-textctrl4.o monolib-toplevel6.o monolib-utils5.o monolib-utilsexc2.o monolib-window6.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = monolib-NSBox.o monolib-NSButton.o monolib-NSControl.o monolib-NSMenu.o monolib-NSPanel.o monolib-NSTextField.o monolib-NSView.o monolib-NSWindow.o monolib-app6.o monolib-bmpbuttn4.o monolib-bitmap5.o monolib-brush5.o monolib-button4.o monolib-checkbox4.o monolib-checklst4.o monolib-choice4.o monolib-colour6.o monolib-control4.o monolib-cursor6.o monolib-data6.o monolib-dc6.o monolib-dcclient6.o monolib-dcmemory6.o monolib-dcscreen6.o monolib-dialog4.o monolib-font6.o monolib-fontutil4.o monolib-frame4.o monolib-gdiobj6.o monolib-icon6.o monolib-listbox4.o monolib-main4.o monolib-menu4.o monolib-menuitem3.o monolib-pen5.o monolib-radiobox4.o monolib-radiobut4.o monolib-region5.o monolib-settings6.o monolib-slider3.o monolib-statbmp4.o monolib-statbox4.o monolib-statline21.o monolib-stattext4.o monolib-textctrl4.o monolib-toplevel6.o monolib-utils5.o monolib-utilsexc2.o monolib-window6.o monolib-statusbr.o monolib-imaglist.o monolib-listctrl.o monolib-fdrepdlg.o monolib-tabg.o monolib-fontdlgg.o monolib-snglinst.o monolib-utilsunx.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = monolib-accel4.o monolib-app7.o monolib-bitmap6.o monolib-bmpbuttn5.o monolib-brush6.o monolib-button5.o monolib-checkbox5.o monolib-checklst5.o monolib-choice5.o monolib-clipbrd6.o monolib-colour7.o monolib-combobox4.o monolib-control5.o monolib-cursor7.o monolib-data7.o monolib-dataobj5.o monolib-dc7.o monolib-dcclient7.o monolib-dcmemory7.o monolib-dcprint2.o monolib-dcscreen7.o monolib-dialog5.o monolib-dnd2.o monolib-filedlg3.o monolib-font7.o monolib-fontdlg3.o monolib-fontenum4.o monolib-fontutil5.o monolib-frame5.o monolib-gauge3.o monolib-gdiimage1.o monolib-gdiobj7.o monolib-helpwin1.o monolib-icon7.o monolib-iniconf1.o monolib-joystick4.o monolib-listbox5.o monolib-main5.o monolib-menu5.o monolib-menuitem4.o monolib-metafile2.o monolib-mimetype2.o monolib-msgdlg4.o monolib-nativdlg1.o monolib-notebook3.o monolib-ownerdrw1.o monolib-palette5.o monolib-pen6.o monolib-print.o monolib-radiobox5.o monolib-radiobut5.o monolib-region6.o monolib-scrolbar4.o monolib-settings7.o monolib-slider4.o monolib-spinbutt4.o monolib-spinctrl2.o monolib-statbmp5.o monolib-statbox5.o monolib-statline3.o monolib-stattext5.o monolib-tabctrl2.o monolib-textctrl5.o monolib-timer5.o monolib-thread2.o monolib-toolbar2.o monolib-tooltip3.o monolib-toplevel7.o monolib-wave3.o monolib-window7.o monolib-gsocket3.o monolib-gsockpm.o
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
@@ -1566,7 +1583,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = gsockmot.o monodll-accel.o monodll-app3.o monodll-bmpbuttn.o bmpmotif.o monodll-button.o monodll-checkbox.o monodll-checklst.o monodll-choice.o monodll-clipbrd3.o monodll-colour3.o monodll-combobox.o combobox_native.o monodll-control.o monodll-cursor3.o monodll-data3.o monodll-dataobj2.o monodll-dc3.o monodll-dcclient3.o monodll-dcmemory3.o monodll-dcscreen3.o monodll-dialog.o monodll-evtloop3.o filedlg.o monodll-font3.o monodll-frame.o monodll-gauge.o monodll-gdiobj3.o monodll-glcanvas1.o monodll-icon3.o monodll-listbox.o monodll-main2.o monodll-mdi.o monodll-menu.o menuitem.o monodll-minifram2.o monodll-msgdlg.o monodll-palette2.o monodll-radiobox.o monodll-radiobut.o monodll-scrolbar.o monodll-settings3.o monodll-slider.o monodll-spinbutt.o monodll-statbmp.o monodll-statbox.o monodll-stattext.o toolbar.o monodll-textctrl.o monodll-timer2.o monodll-toplevel3.o monodll-utils2.o monodll-window3.o fdrepdlg.o listctrl.o imaglist.o monodll-notebook.o fontdlgg.o colrdlgg.o monodll-statline.o tabg.o dirdlgg.o prntdlgg.o statusbr.o
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = access.o monodll-accel1.o monodll-bmpbuttn1.o monodll-button1.o monodll-checkbox1.o monodll-checklst1.o monodll-choice1.o colordlg.o monodll-combobox1.o monodll-control1.o monodll-dialog1.o dragimag.o monodll-fdrepdlg.o monodll-filedlg.o monodll-fontdlg.o monodll-frame1.o gauge95.o monodll-imaglist.o iniconf.o monodll-listbox1.o monodll-listctrl.o monodll-mdi1.o monodll-menu1.o monodll-menuitem.o metafile.o monodll-msgdlg1.o nativdlg.o monodll-notebook1.o ownerdrw.o penwin.o printdlg.o printwin.o monodll-radiobox1.o monodll-radiobut1.o monodll-scrolbar1.o slider95.o monodll-spinbutt1.o monodll-spinctrl.o monodll-statbmp1.o monodll-statbox1.o statbr95.o monodll-statline1.o monodll-stattext1.o tabctrl.o tbar95.o monodll-textctrl1.o monodll-tglbtn.o treectrl.o mslu.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = monodll-gsocket1.o monodll-accel2.o aga.o monodll-app4.o monodll-bitmap3.o monodll-bmpbuttn2.o monodll-brush3.o monodll-button2.o monodll-checkbox2.o monodll-checklst2.o monodll-choice2.o monodll-clipbrd4.o monodll-colordlg.o monodll-colour4.o monodll-combobox2.o monodll-control2.o monodll-cursor4.o monodll-data4.o monodll-dataobj3.o monodll-dc4.o monodll-dcclient4.o monodll-dcmemory4.o monodll-dcprint.o monodll-dcscreen4.o monodll-dialog2.o monodll-dirdlg.o dirmac.o monodll-dnd.o monodll-filedlg1.o monodll-font4.o monodll-fontdlg1.o monodll-fontenum2.o monodll-fontutil2.o monodll-frame2.o monodll-gauge1.o monodll-gdiobj4.o monodll-icon4.o monodll-joystick2.o monodll-listbox2.o macnotfy.o monodll-mdi2.o monodll-menu2.o monodll-menuitem1.o monodll-metafile.o mimetmac.o monodll-minifram3.o monodll-msgdlg2.o notebmac.o monodll-palette3.o monodll-pen3.o pnghand.o monodll-printdlg.o printmac.o monodll-radiobox2.o monodll-radiobut2.o monodll-region3.o monodll-scrolbar2.o monodll-settings4.o monodll-slider1.o monodll-spinbutt2.o monodll-statbmp2.o monodll-statbox2.o statbrma.o statlmac.o monodll-stattext2.o monodll-tabctrl.o monodll-textctrl2.o monodll-thread.o monodll-timer3.o monodll-toplevel4.o monodll-toolbar.o monodll-tooltip1.o uma.o monodll-utils3.o monodll-utilsexc.o monodll-wave1.o monodll-window4.o MoreFilesX.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o utilsunx.o
-@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = NSBox.o NSButton.o NSControl.o NSMenu.o NSPanel.o NSTextField.o NSView.o NSWindow.o monodll-app5.o monodll-bmpbuttn3.o monodll-bitmap4.o monodll-brush4.o monodll-button3.o monodll-checkbox3.o monodll-checklst3.o monodll-choice3.o monodll-colour5.o monodll-control3.o monodll-cursor5.o monodll-data5.o monodll-dc5.o monodll-dcclient5.o monodll-dcmemory5.o monodll-dcscreen5.o monodll-dialog3.o monodll-font5.o monodll-fontutil3.o monodll-frame3.o monodll-gdiobj5.o monodll-icon5.o monodll-listbox3.o monodll-main3.o monodll-menu3.o monodll-menuitem2.o monodll-pen4.o monodll-radiobox3.o monodll-radiobut3.o monodll-region4.o monodll-settings5.o monodll-slider2.o monodll-statbmp3.o monodll-statbox3.o statline2.o monodll-stattext3.o monodll-textctrl3.o monodll-toplevel5.o monodll-utils4.o monodll-utilsexc1.o monodll-window5.o
+@COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = NSBox.o NSButton.o NSControl.o NSMenu.o NSPanel.o NSTextField.o NSView.o NSWindow.o monodll-app5.o monodll-bmpbuttn3.o monodll-bitmap4.o monodll-brush4.o monodll-button3.o monodll-checkbox3.o monodll-checklst3.o monodll-choice3.o monodll-colour5.o monodll-control3.o monodll-cursor5.o monodll-data5.o monodll-dc5.o monodll-dcclient5.o monodll-dcmemory5.o monodll-dcscreen5.o monodll-dialog3.o monodll-font5.o monodll-fontutil3.o monodll-frame3.o monodll-gdiobj5.o monodll-icon5.o monodll-listbox3.o monodll-main3.o monodll-menu3.o monodll-menuitem2.o monodll-pen4.o monodll-radiobox3.o monodll-radiobut3.o monodll-region4.o monodll-settings5.o monodll-slider2.o monodll-statbmp3.o monodll-statbox3.o statline2.o monodll-stattext3.o monodll-textctrl3.o monodll-toplevel5.o monodll-utils4.o monodll-utilsexc1.o monodll-window5.o statusbr.o imaglist.o listctrl.o fdrepdlg.o tabg.o fontdlgg.o snglinst.o utilsunx.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = monodll-accel3.o monodll-app6.o monodll-bitmap5.o monodll-bmpbuttn4.o monodll-brush5.o monodll-button4.o monodll-checkbox4.o monodll-checklst4.o monodll-choice4.o monodll-clipbrd5.o monodll-colour6.o monodll-combobox3.o monodll-control4.o monodll-cursor6.o monodll-data6.o monodll-dataobj4.o monodll-dc6.o monodll-dcclient6.o monodll-dcmemory6.o monodll-dcprint1.o monodll-dcscreen6.o monodll-dialog4.o monodll-dnd1.o monodll-filedlg2.o monodll-font6.o monodll-fontdlg2.o monodll-fontenum3.o monodll-fontutil4.o monodll-frame4.o monodll-gauge2.o monodll-gdiimage.o monodll-gdiobj6.o monodll-helpwin.o monodll-icon6.o monodll-iniconf.o monodll-joystick3.o monodll-listbox4.o monodll-main4.o monodll-menu4.o monodll-menuitem3.o monodll-metafile1.o monodll-mimetype1.o monodll-msgdlg3.o monodll-nativdlg.o monodll-notebook2.o monodll-ownerdrw.o monodll-palette4.o monodll-pen5.o print.o monodll-radiobox4.o monodll-radiobut4.o monodll-region5.o monodll-scrolbar3.o monodll-settings6.o monodll-slider3.o monodll-spinbutt3.o monodll-spinctrl1.o monodll-statbmp4.o monodll-statbox4.o monodll-statline2.o monodll-stattext4.o monodll-tabctrl1.o monodll-textctrl4.o monodll-timer4.o monodll-thread1.o monodll-toolbar1.o monodll-tooltip2.o monodll-toplevel6.o monodll-wave2.o monodll-window6.o monodll-gsocket2.o gsockpm.o
 @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)-2.5$(__htmldll___targetsuf2)
 @COND_SHARED_0_MONOLITHIC_0@__install_baselib___depname = install_baselib
@@ -1605,7 +1622,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_DEP_1 = $(__wxodbc___depname)
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_LIBR = $(top_builddir)lib/libwxtiff.a
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p_2 = -lwxtiff
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_5 = coredll-fontenum.o coredll-fontutil.o coredll-utilsx11.o coredll-taskbarcmn.o coredll-taskbarx11.o coredll-printps.o coredll-dialup.o coredll-gsockgtk.o coredll-win_gtk.o coredll-app.o coredll-bitmap.o coredll-brush.o coredll-clipbrd.o coredll-colour.o coredll-cursor.o coredll-data.o coredll-dataobj.o coredll-dc.o coredll-dcclient.o coredll-dcmemory.o coredll-dcscreen.o coredll-dnd.o coredll-evtloop.o coredll-font.o coredll-toplevel.o coredll-gdiobj.o coredll-icon.o coredll-main.o coredll-pen.o coredll-popupwin.o coredll-region.o coredll-settings.o coredll-timer.o coredll-tooltip.o coredll-utilsgtk.o coredll-window.o coredll-paletteg.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = coredll-fontenum.o coredll-fontutil.o coredll-utilsx11.o coredll-taskbarcmn.o coredll-taskbarx11.o coredll-printps.o coredll-dialup.o coredll-region1.o coredll-pen1.o coredll-brush1.o coredll-bitmap1.o coredll-utilsx.o