regenerated after fixing OSX install_name and adding wxCocoa files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 57ec18c9b0ed08749b72531803a6e30a9539dbac..5b120b81e257ecae949ebb642b9de70f0beaeff5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2) $(top_builddir)/lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_DEP = $(__wxjpeg___depname)
 @COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2) $(top_builddir)/lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_DEP = $(__wxjpeg___depname)
 @COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng

-@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_SHARED1_MONOLITHIC1@__monodll___depname = $(top_builddir)/lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3)

 @COND_WXUSE_ODBCBUILTIN@__wxodbc___depname = $(top_builddir)/lib/libwxodbc.a
 @COND_TOOLKITGTK@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o gsockgtk.o win_gtk.o app.o bitmap.o brush.o clipbrd.o colour.o cursor.o data.o dataobj.o dc.o dcclient.o dcmemory.o dcscreen.o dnd.o evtloop.o font.o toplevel.o gdiobj.o icon.o monodll-main.o pen.o popupwin.o region.o settings.o timer.o tooltip.o utilsgtk.o window.o paletteg.o
 @COND_TOOLKITMOTIF@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o monodll-region.o monodll-pen.o monodll-brush.o monodll-bitmap.o utilsx.o
 @COND_WXUSE_ODBCBUILTIN@__wxodbc___depname = $(top_builddir)/lib/libwxodbc.a
 @COND_TOOLKITGTK@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o gsockgtk.o win_gtk.o app.o bitmap.o brush.o clipbrd.o colour.o cursor.o data.o dataobj.o dc.o dcclient.o dcmemory.o dcscreen.o dnd.o evtloop.o font.o toplevel.o gdiobj.o icon.o monodll-main.o pen.o popupwin.o region.o settings.o timer.o tooltip.o utilsgtk.o window.o paletteg.o
 @COND_TOOLKITMOTIF@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o monodll-region.o monodll-pen.o monodll-brush.o monodll-bitmap.o utilsx.o


@@ -91,7 +91,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITX11@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o gsockx11.o nanox.o monodll-app1.o monodll-bitmap.o monodll-brush.o monodll-clipbrd1.o monodll-colour1.o monodll-cursor1.o monodll-data1.o monodll-dataobj1.o monodll-dc1.o monodll-dcclient1.o monodll-dcmemory1.o monodll-dcscreen1.o monodll-evtloop1.o monodll-font1.o monodll-gdiobj1.o monodll-glcanvas.o monodll-icon1.o monodll-joystick.o monodll-main1.o monodll-minifram.o monodll-palette.o monodll-pen.o monodll-popupwin1.o monodll-region.o reparent.o monodll-settings1.o monodll-toplevel1.o monodll-utils.o utilsx.o monodll-window1.o monodll-timer1.o
 @COND_TOOLKITMGL@__LOWLEVEL_SRC_OBJECTS = monodll-colour2.o monodll-dc2.o monodll-gdiobj2.o monodll-palette1.o monodll-region2.o monodll-brush2.o monodll-pen2.o monodll-font2.o monodll-data2.o monodll-fontenum1.o monodll-fontutil1.o monodll-evtloop2.o monodll-app2.o monodll-bitmap2.o dirmgl.o monodll-clipbrd2.o monodll-cursor2.o monodll-dcclient2.o monodll-dcmemory2.o monodll-dcscreen2.o monodll-toplevel2.o monodll-icon2.o monodll-settings2.o monodll-window2.o monodll-utils1.o monodll-timer1.o
 @COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_TOOLKITX11@__LOWLEVEL_SRC_OBJECTS = fontenum.o fontutil.o utilsx11.o taskbarcmn.o taskbarx11.o printps.o gsockx11.o nanox.o monodll-app1.o monodll-bitmap.o monodll-brush.o monodll-clipbrd1.o monodll-colour1.o monodll-cursor1.o monodll-data1.o monodll-dataobj1.o monodll-dc1.o monodll-dcclient1.o monodll-dcmemory1.o monodll-dcscreen1.o monodll-evtloop1.o monodll-font1.o monodll-gdiobj1.o monodll-glcanvas.o monodll-icon1.o monodll-joystick.o monodll-main1.o monodll-minifram.o monodll-palette.o monodll-pen.o monodll-popupwin1.o monodll-region.o reparent.o monodll-settings1.o monodll-toplevel1.o monodll-utils.o utilsx.o monodll-window1.o monodll-timer1.o
 @COND_TOOLKITMGL@__LOWLEVEL_SRC_OBJECTS = monodll-colour2.o monodll-dc2.o monodll-gdiobj2.o monodll-palette1.o monodll-region2.o monodll-brush2.o monodll-pen2.o monodll-font2.o monodll-data2.o monodll-fontenum1.o monodll-fontutil1.o monodll-evtloop2.o monodll-app2.o monodll-bitmap2.o dirmgl.o monodll-clipbrd2.o monodll-cursor2.o monodll-dcclient2.o monodll-dcmemory2.o monodll-dcscreen2.o monodll-toplevel2.o monodll-icon2.o monodll-settings2.o monodll-window2.o monodll-utils1.o monodll-timer1.o
 @COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

-@COND_SHARED0_MONOLITHIC1@__monolib___depname = $(top_builddir)/lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.a
+@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_LIBR = $(top_builddir)/lib/libwxtiff.a

 @COND_SHARED1_MONOLITHIC1@__install_monodll___depname = install_monodll
 @COND_PLATFORM_UNIX1@BASE_PLATFORM_HDR = wx/unix/dialup.h \
 @COND_PLATFORM_UNIX1@    wx/unix/gsockunx.h     \
 @COND_SHARED1_MONOLITHIC1@__install_monodll___depname = install_monodll
 @COND_PLATFORM_UNIX1@BASE_PLATFORM_HDR = wx/unix/dialup.h \
 @COND_PLATFORM_UNIX1@    wx/unix/gsockunx.h     \


@@ -106,8 +106,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITMGL@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o
 @COND_TOOLKITGTK@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o
 @COND_TOOLKITMSW@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o
 @COND_TOOLKITMGL@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o
 @COND_TOOLKITGTK@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o
 @COND_TOOLKITMSW@__UNIV_TEXTCTRL_OBJECTS_1 = monolib-textctrl7.o

-@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_LIBR = $(top_builddir)/lib/libwxtiff.a
-@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_LIBR = $(top_builddir)/lib/libwxpng.a
+@COND_PLATFORM_MACOSX1@__monodll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2)

 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetsuf3 = .$(SO_SUFFIX).0.0.0
 @COND_USE_SOVERSION1_PLATFORM_MACOSX1@__monodll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetsuf3 = .$(SO_SUFFIX).0.0.0
 @COND_USE_SOVERSION1_PLATFORM_MACOSX1@__monodll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetsuf2 = .$(SO_SUFFIX).0


@@ -125,8 +124,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITMOTIF@__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_TOOLKITMSW@__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-mslu.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_TOOLKITMAC@__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_TOOLKITMOTIF@__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_TOOLKITMSW@__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-mslu.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_TOOLKITMAC@__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_TOOLKITCOCOA@__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-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_TOOLKITOS2@__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-slider3.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_TOOLKITCOCOA@__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_TOOLKITOS2@__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_WXUSE_REGEXBUILTIN@__LIB_REGEX_p_1 = -lwxregex
 @COND_PLATFORM_MACOSX1@__monodll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_PLATFORM_WIN321@DLLIMPEXT = .a
 @COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p_1 = -lwxregex
 @COND_PLATFORM_MACOSX1@__monodll___macver = -compatibility_version 2.5 -current_version 2.5.0
 @COND_PLATFORM_WIN321@DLLIMPEXT = .a


@@ -400,7 +399,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITCOCOA@    src/cocoa/checkbox.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/checklst.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/choice.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/checkbox.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/checklst.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/choice.mm \

-@COND_TOOLKITCOCOA@    src/cocoa/colour.cpp \
+@COND_TOOLKITCOCOA@    src/cocoa/colour.mm \

 @COND_TOOLKITCOCOA@    src/cocoa/control.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/cursor.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/data.cpp \
 @COND_TOOLKITCOCOA@    src/cocoa/control.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/cursor.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/data.cpp \


@@ -423,6 +422,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITCOCOA@    src/cocoa/radiobut.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/region.cpp \
 @COND_TOOLKITCOCOA@    src/cocoa/settings.cpp \
 @COND_TOOLKITCOCOA@    src/cocoa/radiobut.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/region.cpp \
 @COND_TOOLKITCOCOA@    src/cocoa/settings.cpp \

+@COND_TOOLKITCOCOA@    src/cocoa/slider.mm \

 @COND_TOOLKITCOCOA@    src/cocoa/statbmp.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/statbox.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/statline2.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/statbmp.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/statbox.mm \
 @COND_TOOLKITCOCOA@    src/cocoa/statline2.mm \


@@ -530,20 +530,10 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_TOOLKITMOTIF@__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_TOOLKITMSW@__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 mslu.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_TOOLKITMAC@__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_TOOLKITMOTIF@__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_TOOLKITMSW@__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 mslu.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_TOOLKITMAC@__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_TOOLKITCOCOA@__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-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_TOOLKITOS2@__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-slider2.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_TOOLKITCOCOA@__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_TOOLKITOS2@__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_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p_1 = -lwxjpeg
 @COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p_1 = -lwxjpeg

-@COND_PLATFORM_MACOSX1@__monodll___macinstname = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3)
-@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p_1 = -lwxtiff
-@COND_TOOLKITX11@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl5.o
-@COND_TOOLKITMGL@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
-@COND_TOOLKITGTK@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
-@COND_TOOLKITMSW@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
-@COND_USE_GUI1@__install_gsafm___depname = install-gsafm
-@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
-@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_DEP = $(__wxodbc___depname)
-@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d

 @COND_PLATFORM_UNIX1@BASE_PLATFORM_SRC = src/unix/baseunix.cpp \
 @COND_PLATFORM_UNIX1@    src/unix/dialup.cpp \
 @COND_PLATFORM_UNIX1@    src/unix/dir.cpp \
 @COND_PLATFORM_UNIX1@BASE_PLATFORM_SRC = src/unix/baseunix.cpp \
 @COND_PLATFORM_UNIX1@    src/unix/dialup.cpp \
 @COND_PLATFORM_UNIX1@    src/unix/dir.cpp \


@@ -567,11 +557,21 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN321@    src/msw/utils.cpp \
 @COND_PLATFORM_WIN321@    src/msw/utilsexc.cpp \
 @COND_PLATFORM_WIN321@    src/msw/volume.cpp
 @COND_PLATFORM_WIN321@    src/msw/utils.cpp \
 @COND_PLATFORM_WIN321@    src/msw/utilsexc.cpp \
 @COND_PLATFORM_WIN321@    src/msw/volume.cpp

+@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p_1 = -lwxtiff
+@COND_TOOLKITX11@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl5.o
+@COND_TOOLKITMGL@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
+@COND_TOOLKITGTK@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
+@COND_TOOLKITMSW@__UNIV_TEXTCTRL_OBJECTS = monodll-textctrl6.o
+@COND_USE_GUI1@__install_gsafm___depname = install-gsafm
+@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_DEP = $(__wxodbc___depname)
+@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
+@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_LIBR = $(top_builddir)/lib/libwxpng.a

 @COND_TOOLKITX11@UNIV_TEXTCTRL = src/x11/textctrl.cpp
 @COND_TOOLKITMGL@UNIV_TEXTCTRL = src/univ/textctrl.cpp
 @COND_TOOLKITGTK@UNIV_TEXTCTRL = src/univ/textctrl.cpp
 @COND_TOOLKITMSW@UNIV_TEXTCTRL = src/univ/textctrl.cpp
 @COND_TOOLKITX11@UNIV_TEXTCTRL = src/x11/textctrl.cpp
 @COND_TOOLKITMGL@UNIV_TEXTCTRL = src/univ/textctrl.cpp
 @COND_TOOLKITGTK@UNIV_TEXTCTRL = src/univ/textctrl.cpp
 @COND_TOOLKITMSW@UNIV_TEXTCTRL = src/univ/textctrl.cpp

-@COND_SHARED1_MONOLITHIC1@__monodll___depname = $(top_builddir)/lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3)
+@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc

 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_WXUSE_REGEXBUILTIN@__wxregex___depname = $(top_builddir)/lib/libwxregex.a
 @COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p_1 = -lwxodbc
 @COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg
 @COND_WXUSE_REGEXBUILTIN@__wxregex___depname = $(top_builddir)/lib/libwxregex.a
 @COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p_1 = -lwxodbc


@@ -1093,7 +1093,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUNIV1@WXUNIV_DEFINE = __WXUNIVERSAL__
 @COND_USE_GUI0@__CORE_SRC_OBJECTS_1 = monolib-init.o
 @COND_USE_GUI1_WXUNIV0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_2) $(__GUI_SRC_OBJECTS_1) monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imagfill.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
 @COND_WXUNIV1@WXUNIV_DEFINE = __WXUNIVERSAL__
 @COND_USE_GUI0@__CORE_SRC_OBJECTS_1 = monolib-init.o
 @COND_USE_GUI1_WXUNIV0@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_2) $(__GUI_SRC_OBJECTS_1) monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imagfill.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o

-@COND_USE_GUI1_WXUNIV1@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_3) $(__UNIV_TEXTCTRL_OBJECTS_1) monolib-bmpbuttn6.o monolib-button6.o monolib-checkbox6.o monolib-checklst6.o monolib-choice6.o monolib-colschem.o monolib-combobox5.o monolib-control6.o monolib-dialog6.o monolib-framuniv.o monolib-topluniv.o monolib-gauge4.o monolib-inpcons.o monolib-inphand.o monolib-listbox6.o monolib-menu6.o monolib-notebook4.o monolib-radiobox6.o monolib-radiobut6.o monolib-renderer.o monolib-scrarrow.o monolib-scrolbar5.o monolib-scrthumb.o monolib-slider4.o monolib-spinbutt5.o monolib-statbmp6.o monolib-statbox6.o monolib-statline4.o monolib-stattext6.o monolib-statusbr1.o monolib-toolbar3.o monolib-theme.o monolib-winuniv.o monolib-caret1.o monolib-mdig.o 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-fontdlgg.o monolib-tabg.o monolib-gtk.o monolib-win32.o monolib-metal.o monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imagfill.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o
+@COND_USE_GUI1_WXUNIV1@__CORE_SRC_OBJECTS_1 = $(__LOWLEVEL_SRC_OBJECTS_3) $(__UNIV_TEXTCTRL_OBJECTS_1) monolib-bmpbuttn6.o monolib-button6.o monolib-checkbox6.o monolib-checklst6.o monolib-choice6.o monolib-colschem.o monolib-combobox5.o monolib-control6.o monolib-dialog6.o monolib-framuniv.o monolib-topluniv.o monolib-gauge4.o monolib-inpcons.o monolib-inphand.o monolib-listbox6.o monolib-menu6.o monolib-notebook4.o monolib-radiobox6.o monolib-radiobut6.o monolib-renderer.o monolib-scrarrow.o monolib-scrolbar5.o monolib-scrthumb.o monolib-slider5.o monolib-spinbutt5.o monolib-statbmp6.o monolib-statbox6.o monolib-statline4.o monolib-stattext6.o monolib-statusbr1.o monolib-toolbar3.o monolib-theme.o monolib-winuniv.o monolib-caret1.o monolib-mdig.o 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-fontdlgg.o monolib-tabg.o monolib-gtk.o monolib-win32.o monolib-metal.o monolib-selstore.o monolib-busyinfo.o monolib-calctrl.o monolib-choicdgg.o monolib-dcbuffer.o monolib-dcpsg.o monolib-dirctrlg.o monolib-grid.o monolib-gridctrl.o monolib-gridsel.o monolib-laywin.o monolib-logg.o monolib-numdlgg.o monolib-panelg.o monolib-progdlgg.o monolib-sashwin.o monolib-scrlwing.o monolib-spinctlg.o monolib-splash.o monolib-splitter.o monolib-tbarsmpl.o monolib-textdlgg.o monolib-tipdlg.o monolib-tipwin.o monolib-treectlg.o monolib-wizard.o monolib-accesscmn.o monolib-artprov.o monolib-artstd.o monolib-bmpbase.o monolib-choiccmn.o monolib-clipcmn.o monolib-cmdproc.o monolib-cmndata.o monolib-containr.o monolib-cshelp.o monolib-ctrlcmn.o monolib-ctrlsub.o monolib-dbgrid.o monolib-dcbase.o monolib-dlgcmn.o monolib-dndcmn.o monolib-dobjcmn.o monolib-docmdi.o monolib-docview.o monolib-dpycmn.o monolib-dseldlg.o monolib-effects.o monolib-fddlgcmn.o monolib-fldlgcmn.o monolib-fontcmn.o monolib-framecmn.o monolib-toplvcmn.o monolib-gaugecmn.o monolib-gdicmn.o monolib-geometry.o monolib-gifdecod.o monolib-helpbase.o monolib-iconbndl.o monolib-imagall.o monolib-imagbmp.o monolib-image.o monolib-imagfill.o monolib-imaggif.o monolib-imagiff.o monolib-imagjpeg.o monolib-imagpcx.o monolib-imagpng.o monolib-imagpnm.o monolib-imagtiff.o monolib-imagxpm.o monolib-layout.o monolib-lboxcmn.o monolib-matrix.o monolib-menucmn.o monolib-nbkbase.o monolib-paper.o monolib-popupcmn.o monolib-prntbase.o monolib-quantize.o monolib-radiocmn.o monolib-rgncmn.o monolib-settcmn.o monolib-sizer.o monolib-statbar.o monolib-tbarbase.o monolib-textcmn.o monolib-treebase.o monolib-valgen.o monolib-validate.o monolib-valtext.o monolib-wincmn.o monolib-xpmdecod.o

 @COND_SHARED0_MONOLITHIC1@__install_monolib___depname = install_monolib
 @COND_WXUSE_LIBTIFFBUILTIN@__wxtiff___depname = $(top_builddir)/lib/libwxtiff.a
 @COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff
 @COND_SHARED0_MONOLITHIC1@__install_monolib___depname = install_monolib
 @COND_WXUSE_LIBTIFFBUILTIN@__wxtiff___depname = $(top_builddir)/lib/libwxtiff.a
 @COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff


@@ -1101,10 +1101,11 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2); \
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
 @COND_WXUNIV1@__WXUNIV_DEFINE_p_1 = -D__WXUNIVERSAL__
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2); \
 @COND_USE_SOSYMLINKS1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(DLLIMPEXT)
 @COND_WXUNIV1@__WXUNIV_DEFINE_p_1 = -D__WXUNIVERSAL__

+@COND_SHARED0_MONOLITHIC1@__monolib___depname = $(top_builddir)/lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.a

 @COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
 @COND_USE_GUI0@__CORE_SRC_OBJECTS = init.o
 @COND_USE_GUI1_WXUNIV0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imagfill.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
 @COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
 @COND_USE_GUI0@__CORE_SRC_OBJECTS = init.o
 @COND_USE_GUI1_WXUNIV0@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS) $(__GUI_SRC_OBJECTS) selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imagfill.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o

-@COND_USE_GUI1_WXUNIV1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS_1) $(__UNIV_TEXTCTRL_OBJECTS) monodll-bmpbuttn5.o monodll-button5.o monodll-checkbox5.o monodll-checklst5.o monodll-choice5.o colschem.o monodll-combobox4.o monodll-control5.o monodll-dialog5.o framuniv.o topluniv.o monodll-gauge3.o inpcons.o inphand.o monodll-listbox5.o monodll-menu5.o monodll-notebook3.o monodll-radiobox5.o monodll-radiobut5.o renderer.o scrarrow.o monodll-scrolbar4.o scrthumb.o monodll-slider3.o monodll-spinbutt4.o monodll-statbmp5.o monodll-statbox5.o monodll-statline3.o monodll-stattext5.o monodll-statusbr.o monodll-toolbar2.o theme.o winuniv.o monodll-caret.o mdig.o imaglist.o colrdlgg.o listctrl.o filedlgg.o dirdlgg.o prntdlgg.o accel.o msgdlgg.o fdrepdlg.o fontdlgg.o tabg.o gtk.o win32.o metal.o selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imagfill.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o
+@COND_USE_GUI1_WXUNIV1@__CORE_SRC_OBJECTS = $(__LOWLEVEL_SRC_OBJECTS_1) $(__UNIV_TEXTCTRL_OBJECTS) monodll-bmpbuttn5.o monodll-button5.o monodll-checkbox5.o monodll-checklst5.o monodll-choice5.o colschem.o monodll-combobox4.o monodll-control5.o monodll-dialog5.o framuniv.o topluniv.o monodll-gauge3.o inpcons.o inphand.o monodll-listbox5.o monodll-menu5.o monodll-notebook3.o monodll-radiobox5.o monodll-radiobut5.o renderer.o scrarrow.o monodll-scrolbar4.o scrthumb.o monodll-slider4.o monodll-spinbutt4.o monodll-statbmp5.o monodll-statbox5.o monodll-statline3.o monodll-stattext5.o monodll-statusbr.o monodll-toolbar2.o theme.o winuniv.o monodll-caret.o mdig.o imaglist.o colrdlgg.o listctrl.o filedlgg.o dirdlgg.o prntdlgg.o accel.o msgdlgg.o fdrepdlg.o fontdlgg.o tabg.o gtk.o win32.o metal.o selstore.o busyinfo.o calctrl.o choicdgg.o dcbuffer.o dcpsg.o dirctrlg.o grid.o gridctrl.o gridsel.o laywin.o logg.o numdlgg.o panelg.o progdlgg.o sashwin.o scrlwing.o spinctlg.o splash.o splitter.o tbarsmpl.o textdlgg.o tipdlg.o tipwin.o treectlg.o wizard.o accesscmn.o artprov.o artstd.o bmpbase.o choiccmn.o clipcmn.o cmdproc.o cmndata.o containr.o cshelp.o ctrlcmn.o ctrlsub.o dbgrid.o dcbase.o dlgcmn.o dndcmn.o dobjcmn.o docmdi.o docview.o dpycmn.o dseldlg.o effects.o fddlgcmn.o fldlgcmn.o fontcmn.o framecmn.o toplvcmn.o gaugecmn.o gdicmn.o geometry.o gifdecod.o helpbase.o iconbndl.o imagall.o imagbmp.o image.o imagfill.o imaggif.o imagiff.o imagjpeg.o imagpcx.o imagpng.o imagpnm.o imagtiff.o imagxpm.o layout.o lboxcmn.o matrix.o menucmn.o nbkbase.o paper.o popupcmn.o prntbase.o quantize.o radiocmn.o rgncmn.o settcmn.o sizer.o statbar.o tbarbase.o textcmn.o treebase.o valgen.o validate.o valtext.o wincmn.o xpmdecod.o

 @COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
 @COND_TOOLKITGTK@LOWLEVEL_SRC = src/unix/fontenum.cpp \
 @COND_TOOLKITGTK@    src/unix/fontutil.cpp \
 @COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
 @COND_TOOLKITGTK@LOWLEVEL_SRC = src/unix/fontenum.cpp \
 @COND_TOOLKITGTK@    src/unix/fontutil.cpp \


@@ -3227,7 +3228,7 @@ monolib-imagbmp.o: $(srcdir)/src/common/imagbmp.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 $(top_builddir)/lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3): appbase.o appcmn.o clntdata.o cmdline.o config.o datacmn.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o event.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fontmap.o fs_inet.o fs_mem.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o msgout.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o timercmn.o tokenzr.o txtstrm.o unzip.o url.o utilscmn.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o $(__LIB_ZLIB_DEP) $(__LIB_REGEX_DEP) $(__LIB_PNG_DEP) $(__LIB_JPEG_DEP) $(__LIB_TIFF_DEP) $(__LIB_ODBC_DEP)
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 $(top_builddir)/lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)-2.5$(__monodll___targetsuf3): appbase.o appcmn.o clntdata.o cmdline.o config.o datacmn.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o event.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fontmap.o fs_inet.o fs_mem.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o msgout.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o timercmn.o tokenzr.o txtstrm.o unzip.o url.o utilscmn.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o $(__LIB_ZLIB_DEP) $(__LIB_REGEX_DEP) $(__LIB_PNG_DEP) $(__LIB_JPEG_DEP) $(__LIB_TIFF_DEP) $(__LIB_ODBC_DEP)

-       $(SHARED_LD_CXX) $@  appbase.o appcmn.o clntdata.o cmdline.o config.o datacmn.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o event.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fontmap.o fs_inet.o fs_mem.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o msgout.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o timercmn.o tokenzr.o txtstrm.o unzip.o url.o utilscmn.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o  $(__monodll___importlib) -L$(top_builddir)/lib $(__monodll___importlib) $(__monodll___macinstname) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__monodll___soname_flags) $(__monodll___macver) $(__LIB_ZLIB_LIBR) $(__LIB_REGEX_LIBR) $(__LIB_PNG_LIBR) $(__LIB_JPEG_LIBR) $(__LIB_TIFF_LIBR) $(__LIB_ODBC_LIBR)
+       $(SHARED_LD_CXX) $@  appbase.o appcmn.o clntdata.o cmdline.o config.o datacmn.o datetime.o datstrm.o db.o dbtable.o dircmn.o dynarray.o dynlib.o dynload.o encconv.o event.o extended.o ffile.o file.o fileconf.o filefn.o filename.o filesys.o fmapbase.o fontmap.o fs_inet.o fs_mem.o fs_zip.o ftp.o hash.o hashmap.o http.o intl.o ipcbase.o list.o log.o longlong.o memory.o mimecmn.o module.o msgout.o mstream.o object.o process.o protocol.o regex.o sckaddr.o sckfile.o sckipc.o sckstrm.o socket.o stopwatch.o strconv.o stream.o string.o sysopt.o textbuf.o textfile.o timercmn.o tokenzr.o txtstrm.o unzip.o url.o utilscmn.o variant.o wfstream.o wxchar.o zipstrm.o zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) $(__CORE_SRC_OBJECTS) helpdata.o helpfrm.o helpctrl.o htmlcell.o htmlfilt.o htmlpars.o htmltag.o htmlwin.o winpars.o m_fonts.o m_hline.o m_image.o m_layout.o m_links.o m_list.o m_dflist.o m_pre.o m_tables.o m_style.o htmprint.o  $(__monodll___importlib) -L$(top_builddir)/lib $(__monodll___importlib) $(__monodll___macinstnamecmd) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__monodll___soname_flags) $(__monodll___macver) $(__LIB_ZLIB_LIBR) $(__LIB_REGEX_LIBR) $(__LIB_PNG_LIBR) $(__LIB_JPEG_LIBR) $(__LIB_TIFF_LIBR) $(__LIB_ODBC_LIBR)

        $(__monodll___so_symlinks_cmd)
 
 monolib-timer.o: $(srcdir)/src/gtk/timer.cpp
        $(__monodll___so_symlinks_cmd)
 
 monolib-timer.o: $(srcdir)/src/gtk/timer.cpp


@@ -3321,7 +3322,7 @@ monodll-dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp
 monolib-region.o: $(srcdir)/src/gtk/region.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-region.o: $(srcdir)/src/gtk/region.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 

-monodll-slider2.o: $(srcdir)/src/os2/slider.cpp
+monodll-slider2.o: $(srcdir)/src/cocoa/slider.mm

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 wave.o: $(srcdir)/src/msw/wave.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 wave.o: $(srcdir)/src/msw/wave.cpp


@@ -3348,6 +3349,9 @@ nanox.o: $(srcdir)/src/x11/nanox.c
 monolib-dataobj1.o: $(srcdir)/src/msw/ole/dataobj.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-dataobj1.o: $(srcdir)/src/msw/ole/dataobj.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 

+monodll-slider4.o: $(srcdir)/src/univ/slider.cpp
+       $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
+

 monodll-evtloop1.o: $(srcdir)/src/x11/evtloop.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 monodll-evtloop1.o: $(srcdir)/src/x11/evtloop.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 


@@ -3734,7 +3738,7 @@ monolib-filedlg2.o: $(srcdir)/src/mac/filedlg.cpp
 monolib-gdicmn.o: $(srcdir)/src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-gdicmn.o: $(srcdir)/src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 

-monolib-slider4.o: $(srcdir)/src/univ/slider.cpp
+monolib-slider4.o: $(srcdir)/src/os2/slider.cpp

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp


@@ -4051,7 +4055,7 @@ monolib-effects.o: $(srcdir)/src/common/effects.cpp
 statlmac.o: $(srcdir)/src/mac/statlmac.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 statlmac.o: $(srcdir)/src/mac/statlmac.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 

-monodll-colour5.o: $(srcdir)/src/cocoa/colour.cpp
+monodll-colour5.o: $(srcdir)/src/cocoa/colour.mm

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 monodll-textctrl5.o: $(srcdir)/src/x11/textctrl.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 monodll-textctrl5.o: $(srcdir)/src/x11/textctrl.cpp


@@ -4486,7 +4490,7 @@ monolib-msgdlg4.o: $(srcdir)/src/os2/msgdlg.cpp
 monolib-slider.o: $(srcdir)/src/gtk/slider.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-slider.o: $(srcdir)/src/gtk/slider.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 

-monodll-slider3.o: $(srcdir)/src/univ/slider.cpp
+monodll-slider3.o: $(srcdir)/src/os2/slider.cpp

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 monolib-printwin.o: $(srcdir)/src/msw/printwin.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 monolib-printwin.o: $(srcdir)/src/msw/printwin.cpp


@@ -5120,6 +5124,9 @@ monodll-statline.o: $(srcdir)/src/generic/statline.cpp
 busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 
 busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CXXFLAGS) $(PIC_FLAG) $<
 

+monolib-slider5.o: $(srcdir)/src/univ/slider.cpp
+       $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
+

 monolib-numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 


@@ -5420,7 +5427,7 @@ monodll-printdlg.o: $(srcdir)/src/mac/printdlg.cpp
 monolib-win32.o: $(srcdir)/src/univ/themes/win32.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-win32.o: $(srcdir)/src/univ/themes/win32.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 

-monolib-slider3.o: $(srcdir)/src/os2/slider.cpp
+monolib-slider3.o: $(srcdir)/src/cocoa/slider.mm

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-process.o: $(srcdir)/src/common/process.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-process.o: $(srcdir)/src/common/process.cpp


@@ -5671,7 +5678,7 @@ m_fonts.o: $(srcdir)/src/html/m_fonts.cpp
 monodll-gsocket1.o: $(srcdir)/src/mac/gsocket.c
        $(CC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CFLAGS) $(PIC_FLAG) $<
 
 monodll-gsocket1.o: $(srcdir)/src/mac/gsocket.c
        $(CC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/include -D__WXBASE__ -DWXMAKINGDLL $(DEPS_FLAG) $(CFLAGS) $(PIC_FLAG) $<
 

-monolib-colour6.o: $(srcdir)/src/cocoa/colour.cpp
+monolib-colour6.o: $(srcdir)/src/cocoa/colour.mm

        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-palette.o: $(srcdir)/src/msw/palette.cpp
        $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -I$(srcdir)/include -D__WXBASE__ $(DEPS_FLAG) $(CXXFLAGS) $<
 
 monolib-palette.o: $(srcdir)/src/msw/palette.cpp