X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fa541e8706f74887efeba9e475eae618873da2a..6f24b81707fe53df2e2458ea928e071712f3bc72:/build/bakefiles/files.bkl diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ce89734eec..fca4e9bb37 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -58,31 +58,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <set var="BASE_UNIX_AND_DARWIN_SRC" hints="files"> src/common/fdiodispatcher.cpp src/common/selectdispatcher.cpp - src/unix/epolldispatcher.cpp src/unix/appunix.cpp - src/unix/evtloopunix.cpp src/unix/dir.cpp src/unix/dlunix.cpp + src/unix/epolldispatcher.cpp + src/unix/evtloopunix.cpp + src/unix/fdiounix.cpp src/unix/snglinst.cpp + src/unix/stackwalk.cpp src/unix/stdpaths.cpp src/unix/timerunx.cpp src/unix/threadpsx.cpp - src/unix/stackwalk.cpp src/unix/utilsunx.cpp + src/unix/fswatcher_kqueue.cpp </set> <set var="BASE_UNIX_AND_DARWIN_HDR" hints="files"> - wx/private/fdiodispatcher.h - wx/private/selectdispatcher.h wx/unix/app.h wx/unix/apptbase.h wx/unix/apptrait.h wx/unix/chkconf.h wx/unix/evtloop.h + wx/unix/evtloopsrc.h wx/unix/pipe.h wx/unix/stdpaths.h wx/unix/stackwalk.h wx/unix/tls.h + wx/unix/fswatcher_kqueue.h </set> <!-- @@ -109,9 +111,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! --> <set var="BASE_UNIX_SRC" hints="files"> $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) + src/unix/fswatcher_inotify.cpp </set> <set var="BASE_UNIX_HDR" hints="files"> $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR) + wx/unix/fswatcher_inotify.h </set> <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> @@ -135,6 +139,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/timer.cpp src/msw/utils.cpp src/msw/utilsexc.cpp + src/msw/fswatcher.cpp </set> <set var="BASE_AND_GUI_WIN32_SRC" hints="files"> src/msw/evtloop.cpp @@ -166,6 +171,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/wrapcctl.h wx/msw/wrapcdlg.h wx/msw/wrapwin.h + wx/msw/fswatcher.h </set> <set var="BASE_WINCE_HDR" hints="files"> <if cond="TOOLKIT=='WINCE'"> @@ -181,6 +187,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <!-- Used on Mac OS X wxMac base, and Mac OS X darwin base --> <set var="BASE_COREFOUNDATION_SRC" hints="files"> src/osx/core/cfstring.cpp + src/osx/core/evtloop_cf.cpp src/osx/core/stdpaths_cf.cpp src/osx/core/strconv_cf.cpp src/osx/core/utilsexc_base.cpp @@ -215,6 +222,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/utils.mm </set> +<set var="BASE_AND_GUI_OSX_IPHONE_SRC" hints="files"> + src/osx/iphone/utils.mm +</set> + <!-- Base files used by non-wxMac OS X builds --> <set var="BASE_OSX_NOTWXMAC_SRC" hints="files"> $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC) @@ -237,6 +248,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/unix/timerunx.cpp src/os2/dir.cpp src/os2/mimetype.cpp + src/os2/snglinst.cpp src/os2/stdpaths.cpp src/os2/thread.cpp src/os2/utils.cpp @@ -304,6 +316,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <!-- Common --> <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --> <set var="BASE_CMN_SRC" hints="files"> + src/common/any.cpp src/common/appbase.cpp src/common/arcall.cpp src/common/arcfind.cpp @@ -315,6 +328,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/config.cpp src/common/convauto.cpp src/common/datetime.cpp + src/common/datetimefmt.cpp src/common/datstrm.cpp src/common/dircmn.cpp src/common/dynarray.cpp @@ -340,6 +354,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/init.cpp src/common/intl.cpp src/common/ipcbase.cpp + src/common/languageinfo.cpp src/common/list.cpp src/common/log.cpp src/common/longlong.cpp @@ -347,6 +362,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/mimecmn.cpp src/common/module.cpp src/common/mstream.cpp + src/common/numformatter.cpp src/common/object.cpp src/common/platinfo.cpp src/common/powercmn.cpp @@ -354,6 +370,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/regex.cpp src/common/stdpbase.cpp src/common/sstream.cpp + src/common/stdstream.cpp src/common/stopwatch.cpp src/common/strconv.cpp src/common/stream.cpp @@ -368,6 +385,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/timercmn.cpp src/common/timerimpl.cpp src/common/tokenzr.cpp + src/common/translation.cpp src/common/txtstrm.cpp src/common/unichar.cpp src/common/uri.cpp @@ -381,6 +399,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/xtistrm.cpp src/common/zipstrm.cpp src/common/zstream.cpp + src/common/fswatchercmn.cpp + src/generic/fswatcherg.cpp </set> <set var="BASE_AND_GUI_CMN_SRC" hints="files"> src/common/event.cpp @@ -390,6 +410,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! </set> <set var="BASE_CMN_HDR" hints="files"> wx/afterstd.h + wx/any.h + wx/anystr.h wx/app.h wx/apptrait.h wx/archive.h @@ -401,6 +423,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/buffer.h wx/build.h wx/chartype.h + wx/checkeddelete.h wx/chkconf.h wx/clntdata.h wx/cmdargs.h @@ -424,6 +447,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dynload.h wx/encconv.h wx/event.h + wx/evtloop.h wx/except.h wx/features.h wx/flags.h @@ -451,6 +475,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/ipc.h wx/ipcbase.h wx/kbdstate.h + wx/language.h wx/link.h wx/list.h wx/listimpl.cpp @@ -464,7 +489,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/module.h wx/mousestate.h wx/msgout.h + wx/msgqueue.h wx/mstream.h + wx/numformatter.h wx/object.h wx/platform.h wx/platinfo.h @@ -474,12 +501,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/ptr_shrd.h wx/recguard.h wx/regex.h + wx/rtti.h + wx/scopedarray.h + wx/scopedptr.h wx/scopeguard.h + wx/sharedptr.h wx/snglinst.h wx/sstream.h wx/stack.h wx/stackwalk.h wx/stdpaths.h + wx/stdstream.h wx/stockitem.h wx/stopwatch.h wx/strconv.h @@ -498,7 +530,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/tls.h wx/tokenzr.h wx/tracker.h + wx/translation.h wx/txtstrm.h + wx/typeinfo.h wx/types.h wx/unichar.h wx/uri.h @@ -507,6 +541,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/variant.h wx/vector.h wx/version.h + wx/versioninfo.h wx/volume.h wx/weakref.h wx/wfstream.h @@ -518,13 +553,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/wxprec.h wx/xlocale.h wx/xti.h + wx/xti2.h wx/xtistrm.h + wx/xtictor.h + wx/xtihandler.h + wx/xtiprop.h + wx/xtitypes.h wx/zipstrm.h wx/zstream.h wx/meta/convertible.h wx/meta/if.h + wx/meta/implicitconversion.h wx/meta/int2type.h wx/meta/movable.h + wx/meta/pod.h + wx/fswatcher.h + wx/generic/fswatcher.h </set> @@ -577,6 +621,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h + wx/protocol/log.h wx/protocol/protocol.h wx/sckaddr.h wx/sckipc.h @@ -609,14 +654,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/appcmn.cpp src/common/artprov.cpp src/common/artstd.cpp + src/common/arttango.cpp src/common/bmpbase.cpp + src/common/bmpbtncmn.cpp src/common/bookctrl.cpp src/common/btncmn.cpp src/common/cairo.cpp + src/common/checkboxcmn.cpp + src/common/checklstcmn.cpp src/common/choiccmn.cpp src/common/clipcmn.cpp src/common/clrpickercmn.cpp src/common/colourcmn.cpp + src/common/colourdata.cpp src/common/combocmn.cpp src/common/cmdproc.cpp src/common/cmndata.cpp @@ -624,11 +674,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/cshelp.cpp src/common/ctrlcmn.cpp src/common/ctrlsub.cpp - src/common/datacmn.cpp src/common/dcbase.cpp src/common/dcbufcmn.cpp src/common/dcgraph.cpp src/common/dcsvg.cpp + src/common/dirctrlcmn.cpp src/common/dlgcmn.cpp src/common/dndcmn.cpp src/common/dobjcmn.cpp @@ -639,10 +689,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/effects.cpp src/common/fddlgcmn.cpp src/common/filectrlcmn.cpp + src/common/filehistorycmn.cpp src/common/filepickercmn.cpp src/common/fontpickercmn.cpp src/common/fldlgcmn.cpp src/common/fontcmn.cpp + src/common/fontdata.cpp + src/generic/graphicc.cpp src/common/fontenumcmn.cpp src/common/fontmap.cpp src/common/fontutilcmn.cpp @@ -673,25 +726,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/layout.cpp src/common/lboxcmn.cpp src/common/listctrlcmn.cpp + src/common/markupparser.cpp src/common/matrix.cpp src/common/menucmn.cpp + src/common/mousemanager.cpp src/common/nbkbase.cpp src/common/overlaycmn.cpp + src/common/ownerdrwcmn.cpp src/common/paper.cpp + src/common/panelcmn.cpp src/common/persist.cpp src/common/pickerbase.cpp src/common/popupcmn.cpp src/common/prntbase.cpp src/common/quantize.cpp + src/common/radiobtncmn.cpp src/common/radiocmn.cpp src/common/rearrangectrl.cpp src/common/rendcmn.cpp src/common/rgncmn.cpp + src/common/scrolbarcmn.cpp src/common/settcmn.cpp src/common/sizer.cpp + src/common/slidercmn.cpp + src/common/spinbtncmn.cpp src/common/spinctrlcmn.cpp src/common/srchcmn.cpp src/common/statbar.cpp + src/common/statbmpcmn.cpp + src/common/statboxcmn.cpp + src/common/statlinecmn.cpp src/common/stattextcmn.cpp src/common/stockitem.cpp src/common/tbarbase.cpp @@ -699,9 +763,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/textentrycmn.cpp src/common/toplvcmn.cpp src/common/treebase.cpp + src/common/uiactioncmn.cpp src/common/valgen.cpp src/common/validate.cpp src/common/valtext.cpp + src/common/valnum.cpp src/common/wincmn.cpp src/common/windowid.cpp src/common/wrapsizer.cpp @@ -716,13 +782,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/dragimgg.cpp src/generic/filectrlg.cpp src/generic/headerctrlg.cpp + src/generic/infobar.cpp src/generic/listbkg.cpp src/generic/logg.cpp + src/generic/markuptext.cpp + src/generic/msgdlgg.cpp src/generic/numdlgg.cpp src/generic/panelg.cpp src/generic/progdlgg.cpp src/generic/printps.cpp src/generic/renderg.cpp + src/generic/richmsgdlgg.cpp src/generic/scrlwing.cpp src/generic/selstore.cpp src/generic/spinctlg.cpp @@ -751,6 +821,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/collpane.h wx/combo.h wx/combobox.h + wx/compositewin.h wx/control.h wx/ctrlsub.h wx/cursor.h @@ -780,6 +851,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/dragimgg.h wx/generic/filectrlg.h wx/generic/headerctrlg.h + wx/generic/infobar.h wx/generic/logg.h wx/generic/msgdlgg.h wx/generic/numdlgg.h @@ -788,6 +860,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/prntdlgg.h wx/generic/printps.h wx/generic/progdlgg.h + wx/generic/richmsgdlgg.h wx/generic/scrolwin.h wx/generic/spinctlg.h wx/generic/splitter.h @@ -801,10 +874,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/headerctrl.h wx/helphtml.h wx/icon.h + wx/infobar.h wx/layout.h wx/listbox.h wx/mdi.h wx/menu.h + wx/mousemanager.h wx/msgdlg.h wx/nativewin.h wx/numdlg.h @@ -815,8 +890,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/position.h wx/radiobox.h wx/radiobut.h + wx/range.h wx/rearrangectrl.h wx/renderer.h + wx/richmsgdlg.h wx/scrolbar.h wx/scrolbar.h wx/scrolwin.h @@ -828,12 +905,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/statbox.h wx/stattext.h wx/statusbr.h + wx/textcompleter.h wx/textctrl.h wx/textdlg.h wx/textentry.h + wx/textwrapper.h wx/toolbar.h wx/validate.h wx/valtext.h + wx/valnum.h wx/window.h wx/windowid.h wx/wrapsizer.h @@ -855,6 +935,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/cmdproc.h wx/colordlg.h wx/colour.h + wx/colourdata.h wx/cshelp.h wx/dataobj.h wx/dcmirror.h @@ -867,13 +948,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/docmdi.h wx/docview.h wx/effects.h - wx/evtloop.h + wx/evtloopsrc.h wx/fdrepdlg.h wx/filectrl.h + wx/filehistory.h wx/filepicker.h wx/fontpicker.h wx/fmappriv.h wx/font.h + wx/fontdata.h wx/fontdlg.h wx/fontenum.h wx/fontutil.h @@ -936,6 +1019,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/treebase.h wx/treebook.h wx/treectrl.h + wx/uiaction.h wx/valgen.h wx/vidmode.h wx/vlbox.h @@ -961,10 +1045,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/caret.cpp src/generic/imaglist.cpp src/unix/dialup.cpp + src/unix/displayx11.cpp src/unix/fontenum.cpp src/unix/fontutil.cpp + src/unix/uiactionx11.cpp src/unix/utilsx11.cpp - src/unix/displayx11.cpp </set> <set var="XWIN_LOWLEVEL_HDR" hints="files"> wx/generic/caret.h @@ -983,7 +1068,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp - src/gtk/assertdlg_gtk.c + src/gtk/assertdlg_gtk.cpp src/gtk/bitmap.cpp src/gtk/brush.cpp src/gtk/clipbrd.cpp @@ -997,6 +1082,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/dnd.cpp src/gtk/evtloop.cpp src/gtk/filectrl.cpp + src/gtk/filehistory.cpp src/gtk/font.cpp src/gtk/sockgtk.cpp src/gtk/minifram.cpp @@ -1033,7 +1119,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/dcscreen.h wx/gtk/dnd.h wx/gtk/evtloop.h + wx/gtk/evtloopsrc.h wx/gtk/font.h + wx/gtk/filehistory.h wx/gtk/minifram.h wx/gtk/pen.h wx/gtk/popupwin.h @@ -1049,13 +1137,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fdrepdlg.cpp <!-- Needed as long as we support GTK+ < 2.6 --> src/generic/filepickerg.cpp - src/generic/graphicc.cpp src/generic/listctrl.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp <!-- Generic implementations used by wxGPE: --> src/generic/fontdlgg.cpp - src/generic/msgdlgg.cpp <!-- GTK+ specific files: --> src/gtk/artgtk.cpp src/gtk/bmpbuttn.cpp @@ -1078,7 +1164,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/gauge.cpp src/gtk/gnome/gprint.cpp src/gtk/gnome/gvfs.cpp - src/gtk/print.cpp + src/gtk/infobar.cpp src/gtk/listbox.cpp src/gtk/mdi.cpp src/gtk/menu.cpp @@ -1086,6 +1172,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/msgdlg.cpp src/gtk/nativewin.cpp src/gtk/notebook.cpp + src/gtk/print.cpp src/gtk/radiobox.cpp src/gtk/radiobut.cpp src/gtk/scrolbar.cpp @@ -1097,7 +1184,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/statbox.cpp src/gtk/statline.cpp src/gtk/stattext.cpp - src/gtk/tbargtk.cpp + src/gtk/toolbar.cpp src/gtk/textctrl.cpp src/gtk/textentry.cpp src/gtk/tglbtn.cpp @@ -1132,13 +1219,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/gauge.h wx/gtk/gnome/gprint.h wx/gtk/gnome/gvfs.h - wx/gtk/print.h + wx/gtk/infobar.h wx/gtk/listbox.h wx/gtk/mdi.h wx/gtk/menu.h wx/gtk/menuitem.h wx/gtk/msgdlg.h wx/gtk/notebook.h + wx/gtk/print.h wx/gtk/radiobox.h wx/gtk/radiobut.h wx/gtk/scrolbar.h @@ -1150,7 +1238,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk/statbox.h wx/gtk/statline.h wx/gtk/stattext.h - wx/gtk/tbargtk.h + wx/gtk/toolbar.h wx/gtk/textctrl.h wx/gtk/textentry.h wx/gtk/tglbtn.h @@ -1237,7 +1325,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/fontdlgg.cpp src/generic/fontpickerg.cpp src/generic/listctrl.cpp - src/generic/msgdlgg.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp <!-- GTK1 specific files: --> @@ -1256,6 +1343,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/listbox.cpp src/gtk1/mdi.cpp src/gtk1/menu.cpp + src/gtk1/mnemonics.cpp src/gtk1/notebook.cpp src/gtk1/radiobox.cpp src/gtk1/radiobut.cpp @@ -1268,7 +1356,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/statbox.cpp src/gtk1/statline.cpp src/gtk1/stattext.cpp - src/gtk1/tbargtk.cpp + src/gtk1/toolbar.cpp src/gtk1/textctrl.cpp src/gtk1/tglbtn.cpp </set> @@ -1314,7 +1402,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk1/statbox.h wx/gtk1/statline.h wx/gtk1/stattext.h - wx/gtk1/tbargtk.h + wx/gtk1/toolbar.h wx/gtk1/textctrl.h wx/gtk1/tglbtn.h wx/gtk1/treectrl.h @@ -1561,6 +1649,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <!-- ====================================================================== --> <set var="MSW_LOWLEVEL_SRC" hints="files"> + src/msw/ole/activex.cpp src/msw/app.cpp src/msw/bitmap.cpp src/msw/brush.cpp @@ -1602,11 +1691,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/settings.cpp src/msw/tooltip.cpp src/msw/toplevel.cpp + src/msw/uiaction.cpp src/msw/utilsgui.cpp src/msw/uxtheme.cpp src/msw/window.cpp </set> <set var="MSW_LOWLEVEL_HDR" hints="files"> + wx/msw/ole/activex.h wx/msw/popupwin.h wx/msw/uxtheme.h wx/msw/uxthemep.h @@ -1661,10 +1752,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/nativewin.cpp src/msw/notebook.cpp src/msw/ole/access.cpp - src/msw/ole/activex.cpp src/msw/ownerdrw.cpp + src/msw/panel.cpp + src/msw/progdlg.cpp src/msw/radiobox.cpp src/msw/radiobut.cpp + src/msw/richmsgdlg.cpp src/msw/scrolbar.cpp src/msw/slider.cpp src/msw/spinbutt.cpp @@ -1734,21 +1827,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/msvcrt.h wx/msw/notebook.h wx/msw/ole/access.h - wx/msw/ole/activex.h wx/msw/ole/dataform.h wx/msw/ole/dataobj.h wx/msw/ole/dataobj2.h wx/msw/ole/dropsrc.h wx/msw/ole/droptgt.h wx/msw/ole/oleutils.h + wx/msw/ownerdrw.h wx/msw/palette.h + wx/msw/panel.h wx/msw/pen.h wx/msw/printdlg.h wx/msw/printwin.h + wx/msw/progdlg.h wx/msw/radiobox.h wx/msw/radiobut.h wx/msw/region.h wx/msw/rcdefs.h + wx/msw/richmsgdlg.h wx/msw/scrolbar.h wx/msw/setup0.h wx/msw/slider.h @@ -2121,6 +2217,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/os2/minifram.h wx/os2/msgdlg.h wx/os2/notebook.h + wx/os2/ownerdrw.h wx/os2/palette.h wx/os2/pen.h wx/os2/pnghand.h @@ -2151,46 +2248,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <!-- ====================================================================== --> -<!-- wxMac --> +<!-- wxOSX Common --> <!-- ====================================================================== --> <set var="OSX_LOWLEVEL_SRC" hints="files"> <!-- Shared wxMac and wxCocoa files --> <if cond="PLATFORM_MACOSX=='1'"> - src/osx/accel.cpp - src/osx/bmpbuttn_osx.cpp + src/osx/artmac.cpp src/osx/brush.cpp - src/osx/button_osx.cpp - src/osx/checkbox_osx.cpp - src/osx/checklst_osx.cpp - src/osx/choice_osx.cpp src/osx/dialog_osx.cpp src/osx/fontutil.cpp - src/osx/gauge_osx.cpp src/osx/imaglist.cpp - src/osx/listbox_osx.cpp - src/osx/menu_osx.cpp - src/osx/menuitem_osx.cpp src/osx/minifram.cpp src/osx/nonownedwnd_osx.cpp - src/osx/notebook_osx.cpp src/osx/palette.cpp src/osx/pen.cpp - src/osx/printdlg_osx.cpp - src/osx/radiobox_osx.cpp - src/osx/radiobut_osx.cpp - src/osx/scrolbar_osx.cpp - src/osx/slider_osx.cpp - src/osx/spinbutt_osx.cpp - src/osx/spinctrl_osx.cpp - src/osx/srchctrl_osx.cpp - src/osx/statbox_osx.cpp - src/osx/statline_osx.cpp - src/osx/stattext_osx.cpp - src/osx/textctrl_osx.cpp - src/osx/tglbtn_osx.cpp - src/osx/toolbar_osx.cpp src/osx/toplevel_osx.cpp + src/osx/uiaction_osx.cpp src/osx/utils_osx.cpp <!-- src/osx/treectrl.cpp --> src/osx/window_osx.cpp @@ -2221,12 +2295,41 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! <set var="OSX_CARBON_COCOA_SRC" hints="files"> <if cond="PLATFORM_MACOSX=='1'"> + <!-- Common controls implementation --> + src/osx/bmpbuttn_osx.cpp + src/osx/button_osx.cpp + src/osx/checkbox_osx.cpp + src/osx/checklst_osx.cpp + src/osx/choice_osx.cpp + src/osx/combobox_osx.cpp + src/osx/dnd_osx.cpp + src/osx/gauge_osx.cpp + src/osx/listbox_osx.cpp + src/osx/menu_osx.cpp + src/osx/menuitem_osx.cpp + src/osx/notebook_osx.cpp + src/osx/printdlg_osx.cpp + src/osx/radiobox_osx.cpp + src/osx/radiobut_osx.cpp + src/osx/scrolbar_osx.cpp + src/osx/slider_osx.cpp + src/osx/spinbutt_osx.cpp + src/osx/spinctrl_osx.cpp + src/osx/srchctrl_osx.cpp + src/osx/statbox_osx.cpp + src/osx/statline_osx.cpp + src/osx/stattext_osx.cpp + src/osx/textentry_osx.cpp + src/osx/textctrl_osx.cpp + src/osx/tglbtn_osx.cpp + src/osx/toolbar_osx.cpp <!-- wxWebKit files --> - <!-- (TODO Move one level up) --> + src/html/htmlctrl/webkit/webkit.mm <!-- Native color/font dialogs --> src/osx/carbon/colordlgosx.mm src/osx/carbon/fontdlgosx.mm <!-- other shared files --> + src/osx/accel.cpp src/osx/carbon/clipbrd.cpp src/osx/carbon/cursor.cpp src/osx/carbon/fontdlg.cpp @@ -2241,7 +2344,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/carbon/dcscreen.cpp src/osx/core/glgrab.cpp src/osx/carbon/graphics.cpp - src/osx/carbon/dnd.cpp src/osx/carbon/font.cpp src/osx/carbon/frame.cpp src/osx/carbon/mdi.cpp @@ -2251,65 +2353,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/carbon/renderer.cpp src/osx/carbon/settings.cpp src/osx/carbon/statbrma.cpp + src/osx/carbon/region.cpp <!-- cocoa bridge --> src/osx/carbon/utilscocoa.mm -</if> -</set> - -<set var="OSX_CARBON_SRC" hints="files"> - <!-- carbon files --> - $(OSX_CARBON_COCOA_SRC) - src/osx/artmac.cpp - src/osx/carbon/bmpbuttn.cpp - src/osx/carbon/button.cpp - src/osx/carbon/checkbox.cpp - src/osx/carbon/choice.cpp - src/osx/carbon/colordlg.cpp - src/osx/carbon/dialog.cpp - src/osx/carbon/dirdlg.cpp - src/osx/carbon/evtloop.cpp - src/osx/carbon/filedlg.cpp - src/osx/carbon/gauge.cpp - src/osx/carbon/listbox.cpp - src/osx/carbon/listctrl_mac.cpp - src/osx/carbon/menu.cpp - src/osx/carbon/menuitem.cpp - src/osx/carbon/msgdlg.cpp - src/osx/carbon/nonownedwnd.cpp - src/osx/carbon/notebmac.cpp - src/osx/carbon/printdlg.cpp - src/osx/carbon/radiobut.cpp - src/osx/carbon/region.cpp - src/osx/carbon/scrolbar.cpp - src/osx/carbon/slider.cpp - src/osx/carbon/spinbutt.cpp - src/osx/carbon/srchctrl.cpp - src/osx/carbon/statbmp.cpp - src/osx/carbon/statbox.cpp - src/osx/carbon/statlmac.cpp - src/osx/carbon/stattext.cpp - src/osx/carbon/textctrl.cpp - src/osx/carbon/tglbtn.cpp - src/osx/carbon/toolbar.cpp - src/osx/carbon/tooltip.cpp - src/osx/carbon/window.cpp - - src/html/htmlctrl/webkit/webkit.mm - <!-- Generic implementations used by wxMac: --> + <!-- Generic implementations used by wxOSX: --> src/generic/caret.cpp src/generic/clrpickerg.cpp src/generic/collpaneg.cpp + src/generic/colrdlgg.cpp + src/generic/dirdlgg.cpp src/generic/fdrepdlg.cpp + src/generic/filedlgg.cpp src/generic/filepickerg.cpp src/generic/fontdlgg.cpp src/generic/fontpickerg.cpp src/generic/listctrl.cpp src/generic/prntdlgg.cpp src/generic/statusbr.cpp +</if> </set> <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h --> <set var="OSX_SHARED_HDR" hints="files"> + <!-- wxWebKit headers --> + wx/html/webkit.h + <!-- other shared headers --> wx/osx/accel.h wx/osx/app.h wx/osx/bitmap.h @@ -2338,6 +2406,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/dirdlg.h wx/osx/dnd.h wx/osx/evtloop.h + wx/osx/evtloopsrc.h wx/osx/filedlg.h wx/osx/font.h wx/osx/fontdlg.h @@ -2380,6 +2449,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/statusbr.h wx/osx/taskbarosx.h wx/osx/textctrl.h + wx/osx/textentry.h wx/osx/tglbtn.h wx/osx/toolbar.h wx/osx/tooltip.h @@ -2387,7 +2457,64 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/treectrl.h wx/osx/uma.h wx/osx/window.h + <!-- Generic implementations used by wxOSX: --> + wx/generic/caret.h + wx/generic/clrpickerg.h + wx/generic/collpaneg.h + wx/generic/colrdlgg.h + wx/generic/dirdlgg.h + wx/generic/fdrepdlg.h + wx/generic/filedlgg.h + wx/generic/filepickerg.h + wx/generic/fontdlgg.h + wx/generic/fontpickerg.h + wx/generic/listctrl.h + wx/generic/prntdlgg.h + wx/generic/statusbr.h +</set> + +<!-- ====================================================================== --> +<!-- wxOSX/Carbon --> +<!-- ====================================================================== --> + +<set var="OSX_CARBON_SRC" hints="files"> + <!-- carbon files --> + $(OSX_CARBON_COCOA_SRC) + src/osx/carbon/bmpbuttn.cpp + src/osx/carbon/button.cpp + src/osx/carbon/checkbox.cpp + src/osx/carbon/choice.cpp + src/osx/carbon/colordlg.cpp + src/osx/carbon/dialog.cpp + src/osx/carbon/dirdlg.cpp + src/osx/carbon/dnd.cpp + src/osx/carbon/evtloop.cpp + src/osx/carbon/filedlg.cpp + src/osx/carbon/gauge.cpp + src/osx/carbon/listbox.cpp + src/osx/carbon/listctrl_mac.cpp + src/osx/carbon/menu.cpp + src/osx/carbon/menuitem.cpp + src/osx/carbon/msgdlg.cpp + src/osx/carbon/nonownedwnd.cpp + src/osx/carbon/notebmac.cpp + src/osx/carbon/printdlg.cpp + src/osx/carbon/radiobut.cpp + src/osx/carbon/scrolbar.cpp + src/osx/carbon/slider.cpp + src/osx/carbon/spinbutt.cpp + src/osx/carbon/srchctrl.cpp + src/osx/carbon/statbmp.cpp + src/osx/carbon/statbox.cpp + src/osx/carbon/statlmac.cpp + src/osx/carbon/stattext.cpp + src/osx/carbon/textctrl.cpp + src/osx/carbon/tglbtn.cpp + src/osx/carbon/toolbar.cpp + src/osx/carbon/tooltip.cpp + src/osx/carbon/window.cpp </set> + <!-- wxMac Carbon header files --> <set var="OSX_CARBON_HDR" hints="files"> <!-- core files --> @@ -2402,32 +2529,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/carbon/region.h wx/osx/carbon/statbmp.h wx/osx/carbon/uma.h - <!-- Generic implementations used by wxMac: --> - wx/generic/caret.h - wx/generic/clrpickerg.h - wx/generic/collpaneg.h - wx/generic/fdrepdlg.h - wx/generic/filepickerg.h - wx/generic/fontdlgg.h - wx/generic/fontpickerg.h - wx/generic/listctrl.h - wx/generic/statusbr.h - <!-- wxWebKit headers --> - wx/html/webkit.h </set> <!-- ====================================================================== --> -<!-- wxMac/Cocoa --> +<!-- wxOSX/Cocoa --> <!-- ====================================================================== --> <set var="OSX_COCOA_SRC" hints="files"> $(OSX_CARBON_COCOA_SRC) - src/osx/cocoa/bmpbuttn.mm src/osx/cocoa/button.mm src/osx/cocoa/checkbox.mm src/osx/cocoa/choice.mm + src/osx/cocoa/colour.mm + src/osx/cocoa/combobox.mm src/osx/cocoa/dialog.mm src/osx/cocoa/dirdlg.mm + src/osx/cocoa/dnd.mm src/osx/cocoa/evtloop.mm src/osx/cocoa/filedlg.mm src/osx/cocoa/gauge.mm @@ -2451,17 +2568,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/osx/cocoa/toolbar.mm src/osx/cocoa/tooltip.mm src/osx/cocoa/window.mm - src/generic/caret.cpp - src/generic/clrpickerg.cpp - src/generic/collpaneg.cpp - src/generic/fdrepdlg.cpp - src/generic/filepickerg.cpp - src/generic/fontdlgg.cpp - src/generic/fontpickerg.cpp - src/generic/listctrl.cpp - src/generic/prntdlgg.cpp - src/generic/regiong.cpp - src/generic/statusbr.cpp </set> <set var="OSX_COCOA_HDR" hints="files"> wx/osx/cocoa/chkconf.h @@ -2472,13 +2578,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! </set> <!-- ====================================================================== --> -<!-- wxMac/iPhone --> +<!-- wxOSX/iPhone --> <!-- ====================================================================== --> <set var="OSX_IPHONE_SRC" hints="files"> -src/osx/iphone/nonownedwnd.mm -src/osx/iphone/utils.mm -src/osx/iphone/window.mm + $(OSX_CARBON_COCOA_SRC) + src/generic/regiong.cpp + src/generic/icon.cpp + <!-- iphone files --> + src/osx/iphone/button.mm + src/osx/iphone/checkbox.mm + src/osx/iphone/dialog.mm + src/osx/iphone/evtloop.mm + src/osx/iphone/gauge.mm + src/osx/iphone/msgdlg.mm + src/osx/iphone/nonownedwnd.mm + src/osx/iphone/scrolbar.mm + src/osx/iphone/slider.mm + src/osx/iphone/stattext.mm + src/osx/iphone/textctrl.mm + src/osx/iphone/toolbar.mm + src/osx/iphone/utils.mm + src/osx/iphone/window.mm +</set> + +<set var="OSX_IPHONE_HDR" hints="files"> + wx/osx/iphone/chkconf.h + wx/osx/iphone/evtloop.h + wx/osx/iphone/private.h + $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... --> + wx/generic/region.h </set> <!-- ====================================================================== --> @@ -2580,7 +2709,6 @@ src/osx/iphone/window.mm src/generic/fontpickerg.cpp src/generic/imaglist.cpp src/generic/listctrl.cpp - src/generic/msgdlgg.cpp src/generic/paletteg.cpp src/generic/regiong.cpp src/generic/statusbr.cpp @@ -2701,7 +2829,6 @@ src/osx/iphone/window.mm src/generic/fontpickerg.cpp src/generic/listctrl.cpp src/generic/mdig.cpp - src/generic/msgdlgg.cpp src/generic/prntdlgg.cpp src/univ/bmpbuttn.cpp src/univ/button.cpp @@ -2774,6 +2901,7 @@ src/osx/iphone/window.mm wx/univ/menu.h wx/univ/menuitem.h wx/univ/notebook.h + wx/univ/panel.h wx/univ/radiobox.h wx/univ/radiobut.h wx/univ/renderer.h @@ -2806,10 +2934,13 @@ src/osx/iphone/window.mm src/common/bmpcboxcmn.cpp src/common/calctrlcmn.cpp src/common/datavcmn.cpp + src/common/gridcmn.cpp src/common/hyperlnkcmn.cpp + src/common/odcombocmn.cpp src/generic/aboutdlgg.cpp src/generic/bmpcboxg.cpp src/generic/calctrlg.cpp + src/generic/commandlinkbuttong.cpp src/generic/datavgen.cpp src/generic/datectlg.cpp src/generic/editlbox.cpp @@ -2834,16 +2965,20 @@ src/osx/iphone/window.mm wx/animate.h wx/bmpcbox.h wx/calctrl.h + wx/commandlinkbutton.h wx/dataview.h wx/datectrl.h wx/dateevt.h wx/dcbuffer.h + wx/dvrenderers.h wx/editlbox.h wx/generic/aboutdlgg.h wx/generic/bmpcbox.h wx/generic/calctrlg.h wx/generic/datectrl.h wx/generic/dataview.h + wx/generic/dvrenderer.h + wx/generic/dvrenderers.h wx/generic/grid.h wx/generic/gridctrl.h wx/generic/grideditors.h @@ -2873,14 +3008,14 @@ src/osx/iphone/window.mm <set var="ADVANCED_MSW_SRC" hints="files"> src/common/taskbarcmn.cpp - src/generic/animateg.cpp src/msw/aboutdlg.cpp + src/msw/hyperlink.cpp src/msw/notifmsg.cpp src/msw/sound.cpp src/msw/taskbar.cpp </set> <set var="ADVANCED_MSW_HDR" hints="files"> - wx/generic/animate.h + wx/msw/hyperlink.h wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h @@ -2888,15 +3023,18 @@ src/osx/iphone/window.mm <!-- not used with wxUniv --> <set var="ADVANCED_MSW_NATIVE_SRC" hints="files"> + src/generic/animateg.cpp src/msw/bmpcbox.cpp src/msw/calctrl.cpp + src/msw/commandlinkbutton.cpp src/msw/datecontrols.cpp src/msw/datectrl.cpp </set> <set var="ADVANCED_MSW_NATIVE_HDR" hints="files"> + wx/generic/animate.h wx/msw/bmpcbox.h + wx/msw/commandlinkbutton.h wx/msw/calctrl.h - wx/msw/datecontrols.h wx/msw/datectrl.h </set> @@ -2913,8 +3051,9 @@ src/osx/iphone/window.mm src/generic/animateg.cpp src/osx/carbon/aboutdlg.cpp src/osx/carbon/drawer.cpp + src/osx/dataview_osx.cpp src/osx/carbon/dataview.cpp - src/osx/carbon/databrow.cpp + src/osx/sound_osx.cpp src/osx/carbon/sound.cpp src/osx/carbon/taskbar.cpp src/osx/core/hidjoystick.cpp @@ -2923,20 +3062,25 @@ src/osx/iphone/window.mm <set var="ADVANCED_OSX_CARBON_HDR" hints="files"> wx/generic/animate.h wx/osx/dataview.h + wx/osx/dvrenderer.h + wx/osx/dvrenderers.h wx/osx/joystick.h wx/osx/sound.h + wx/osx/taskbarosx.h wx/osx/carbon/drawer.h wx/osx/carbon/dataview.h - wx/osx/carbon/databrow.h - wx/osx/carbon/sound.h - wx/osx/carbon/taskbarosx.h wx/osx/core/joystick.h </set> <set var="ADVANCED_OSX_COCOA_SRC" hints="files"> src/common/taskbarcmn.cpp src/generic/animateg.cpp + src/osx/sound_osx.cpp + src/osx/carbon/sound.cpp + src/osx/core/sound.cpp src/osx/cocoa/aboutdlg.mm + src/osx/dataview_osx.cpp + src/osx/cocoa/dataview.mm src/osx/cocoa/taskbar.mm src/osx/core/hidjoystick.cpp </set> @@ -2944,14 +3088,24 @@ src/osx/iphone/window.mm <set var="ADVANCED_OSX_COCOA_HDR" hints="files"> wx/generic/animate.h wx/osx/dataview.h + wx/osx/dvrenderer.h + wx/osx/dvrenderers.h wx/osx/joystick.h wx/osx/sound.h - <!--wx/osx/carbon/drawer.h --> - <!--wx/osx/carbon/dataview.h --> - <!--wx/osx/carbon/databrow.h --> - wx/osx/carbon/sound.h - wx/osx/carbon/taskbarosx.h + wx/osx/taskbarosx.h wx/osx/core/joystick.h + wx/osx/cocoa/dataview.h +</set> + +<set var="ADVANCED_OSX_IPHONE_SRC" hints="files"> + src/generic/animateg.cpp + src/osx/sound_osx.cpp + src/osx/core/sound.cpp +</set> + +<set var="ADVANCED_OSX_IPHONE_HDR" hints="files"> + wx/generic/animate.h + wx/osx/sound.h </set> <set var="ADVANCED_COCOA_SRC" hints="files"> @@ -3005,6 +3159,7 @@ src/osx/iphone/window.mm </set> <set var="ADVANCED_GTK_HDR" hints="files"> wx/gtk/hildon/notifmsg.h + wx/gtk/taskbar.h </set> <set var="ADVANCED_GTK_NATIVE_SRC" hints="files"> @@ -3020,6 +3175,8 @@ src/osx/iphone/window.mm wx/gtk/bmpcbox.h wx/gtk/calctrl.h wx/gtk/dataview.h + wx/gtk/dvrenderer.h + wx/gtk/dvrenderers.h wx/gtk/hyperlink.h </set> @@ -3076,6 +3233,12 @@ src/osx/iphone/window.mm <set var="MEDIA_OSX_COCOA_HDR" hints="files"> </set> +<set var="MEDIA_OSX_IPHONE_SRC" hints="files"> + <!-- src/osx/iphone/mediactrl.mm --> +</set> +<set var="MEDIA_OSX_IPHONE_HDR" hints="files"> +</set> + <set var="MEDIA_COCOA_SRC" hints="files"> src/cocoa/mediactrl.mm </set> @@ -3135,8 +3298,10 @@ src/osx/iphone/window.mm src/html/m_links.cpp src/html/m_list.cpp src/html/m_pre.cpp + src/html/m_span.cpp src/html/m_style.cpp src/html/m_tables.cpp + src/html/styleparams.cpp src/html/winpars.cpp <!-- wxHTML users: --> src/generic/htmllbox.cpp @@ -3159,6 +3324,7 @@ src/osx/iphone/window.mm wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h + wx/html/styleparams.h wx/html/winpars.h wx/wxhtml.h <!-- wxHTML users: --> @@ -3184,16 +3350,18 @@ src/osx/iphone/window.mm src/xrc/xh_choic.cpp src/xrc/xh_choicbk.cpp src/xrc/xh_clrpicker.cpp + src/xrc/xh_cmdlinkbn.cpp src/xrc/xh_collpane.cpp src/xrc/xh_combo.cpp src/xrc/xh_comboctrl.cpp src/xrc/xh_datectrl.cpp src/xrc/xh_dirpicker.cpp src/xrc/xh_dlg.cpp - src/xrc/xh_frame.cpp - src/xrc/xh_mdi.cpp + src/xrc/xh_editlbox.cpp + src/xrc/xh_filectrl.cpp src/xrc/xh_filepicker.cpp src/xrc/xh_fontpicker.cpp + src/xrc/xh_frame.cpp src/xrc/xh_gauge.cpp src/xrc/xh_gdctl.cpp src/xrc/xh_grid.cpp @@ -3202,6 +3370,7 @@ src/osx/iphone/window.mm src/xrc/xh_listb.cpp src/xrc/xh_listbk.cpp src/xrc/xh_listc.cpp + src/xrc/xh_mdi.cpp src/xrc/xh_menu.cpp src/xrc/xh_notbk.cpp src/xrc/xh_odcombo.cpp @@ -3227,6 +3396,7 @@ src/osx/iphone/window.mm src/xrc/xh_text.cpp src/xrc/xh_tglbtn.cpp src/xrc/xh_toolb.cpp + src/xrc/xh_toolbk.cpp src/xrc/xh_tree.cpp src/xrc/xh_treebk.cpp src/xrc/xh_unkwn.cpp @@ -3248,12 +3418,15 @@ src/osx/iphone/window.mm wx/xrc/xh_choic.h wx/xrc/xh_choicbk.h wx/xrc/xh_clrpicker.h + wx/xrc/xh_cmdlinkbn.h wx/xrc/xh_collpane.h wx/xrc/xh_combo.h wx/xrc/xh_comboctrl.h wx/xrc/xh_datectrl.h wx/xrc/xh_dirpicker.h wx/xrc/xh_dlg.h + wx/xrc/xh_editlbox.h + wx/xrc/xh_filectrl.h wx/xrc/xh_filepicker.h wx/xrc/xh_fontpicker.h wx/xrc/xh_frame.h @@ -3290,6 +3463,7 @@ src/osx/iphone/window.mm wx/xrc/xh_text.h wx/xrc/xh_tglbtn.h wx/xrc/xh_toolb.h + wx/xrc/xh_toolbk.h wx/xrc/xh_tree.h wx/xrc/xh_treebk.h wx/xrc/xh_unkwn.h @@ -3321,6 +3495,7 @@ src/osx/iphone/window.mm <set var="OPENGL_SRC_PLATFORM" hints="files"> <if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if> <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if> + <if cond="TOOLKIT=='OSX_IPHONE'">src/osx/iphone/glcanvas.mm src/osx/glcanvas_osx.cpp</if> <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if> <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'"> src/gtk/glcanvas.cpp @@ -3343,7 +3518,8 @@ src/osx/iphone/window.mm </set> <set var="OPENGL_HDR_PLATFORM" hints="files"> - <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if> + <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h</if> + <if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if> <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if> <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'"> wx/gtk/glcanvas.h @@ -3395,6 +3571,34 @@ src/osx/iphone/window.mm wx/aui/aui.h </set> +<!-- ====================================================================== --> +<!-- wxRibbon --> +<!-- ====================================================================== --> + +<set var="RIBBON_SRC" hints="files"> + src/ribbon/art_internal.cpp + src/ribbon/art_msw.cpp + src/ribbon/art_aui.cpp + src/ribbon/bar.cpp + src/ribbon/buttonbar.cpp + src/ribbon/control.cpp + src/ribbon/gallery.cpp + src/ribbon/page.cpp + src/ribbon/panel.cpp + src/ribbon/toolbar.cpp +</set> +<set var="RIBBON_HDR" hints="files"> + wx/ribbon/art.h + wx/ribbon/art_internal.h + wx/ribbon/bar.h + wx/ribbon/buttonbar.h + wx/ribbon/control.h + wx/ribbon/gallery.h + wx/ribbon/page.h + wx/ribbon/panel.h + wx/ribbon/toolbar.h +</set> + <!-- ====================================================================== --> <!-- wxPropertyGrid --> <!-- ====================================================================== --> @@ -3435,6 +3639,7 @@ src/osx/iphone/window.mm src/richtext/richtextsymboldlg.cpp src/richtext/richtextstyledlg.cpp src/richtext/richtextprint.cpp + src/richtext/richtextimagedlg.cpp </set> <set var="RICHTEXT_HDR" hints="files"> wx/richtext/richtextctrl.h @@ -3446,6 +3651,7 @@ src/osx/iphone/window.mm wx/richtext/richtextsymboldlg.h wx/richtext/richtextstyledlg.h wx/richtext/richtextprint.h + wx/richtext/richtextimagedlg.h </set> @@ -3474,6 +3680,7 @@ src/osx/iphone/window.mm <set var="BASE_OSX_SRC" hints="files"> <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_SRC)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_SRC)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(BASE_OSX_SHARED_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if> <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if> <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if> @@ -3563,6 +3770,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if> <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if> <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if> @@ -3577,6 +3785,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if> <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if> <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if> <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if> @@ -3597,6 +3806,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if> <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if> </set> @@ -3608,6 +3818,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if> <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if> <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if> </set> @@ -3627,6 +3838,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_SRC)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if> <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if> <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if> @@ -3640,6 +3852,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_HDR)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if> <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if> <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if> <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if> @@ -3676,6 +3889,7 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_SRC)</if> <if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_SRC)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_SRC)</if> <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if> <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if> <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if> @@ -3686,6 +3900,8 @@ src/osx/iphone/window.mm <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if> <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if> <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_HDR)</if> + <if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_HDR)</if> + <if cond="TOOLKIT=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_HDR)</if> <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if> <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if> <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if> @@ -3708,7 +3924,7 @@ src/osx/iphone/window.mm $(GUI_CORE_HEADERS) $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR) $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR) - $(RICHTEXT_HDR) $(STC_HDR) + $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) </if> </set>