<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
</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/pipe.h
wx/unix/stdpaths.h
wx/unix/stackwalk.h
+ wx/unix/tls.h
</set>
<!--
$(BASE_UNIX_AND_DARWIN_HDR)
wx/unix/execute.h
wx/unix/mimetype.h
- wx/unix/private.h
</set>
<!--
-->
<set var="BASE_UNIX_SRC" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
- src/common/gsocketiohandler.cpp
</set>
<set var="BASE_UNIX_HDR" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
- wx/private/gsocketiohandler.h
</set>
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
<!-- 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/gsockosx.cpp
src/osx/core/stdpaths_cf.cpp
src/osx/core/strconv_cf.cpp
src/osx/core/utilsexc_base.cpp
wx/osx/core/cfref.h
wx/osx/core/cfstring.h
wx/osx/core/hid.h
+ wx/osx/core/private.h
wx/osx/core/stdpaths.h
wx/osx/core/private/strconv_cf.h
</set>
-<!-- Base files used by wxMac on OS X -->
-<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC -->
-<set var="BASE_MAC_SRC" hints="files">
- src/osx/carbon/mimetmac.cpp
+<!-- Base files used by OS X ports (not Carbon) -->
+<set var="BASE_OSX_SHARED_SRC" hints="files">
+ src/osx/core/mimetype.cpp
$(BASE_COREFOUNDATION_SRC)
+ $(BASE_UNIX_AND_DARWIN_SRC)
</set>
-<set var="BASE_MAC_HDR" hints="files">
+<set var="BASE_OSX_SHARED_HDR" hints="files">
$(BASE_COREFOUNDATION_HDR)
+ $(BASE_UNIX_AND_DARWIN_HDR)
</set>
<!-- Base and GUI files used by OS X -->
-<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+<set var="BASE_AND_GUI_OSX_CARBON_SRC" hints="files">
src/osx/carbon/utils.cpp
src/osx/carbon/uma.cpp
</set>
-<!-- Base files used only by OS X builds -->
-<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
- $(BASE_MAC_SRC)
- $(BASE_UNIX_AND_DARWIN_SRC)
-</set>
-<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
- $(BASE_MAC_HDR)
- $(BASE_UNIX_AND_DARWIN_HDR)
+<set var="BASE_AND_GUI_OSX_COCOA_SRC" hints="files">
+ src/osx/cocoa/utils.mm
</set>
<!-- Base files used by non-wxMac OS X builds -->
-<set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
+<set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
$(BASE_COREFOUNDATION_SRC)
</set>
-<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
+<set var="BASE_OSX_NOTWXMAC_HDR" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
</set>
<set var="BASE_OS2_SRC" hints="files">
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
- src/common/gsocketiohandler.cpp
src/unix/appunix.cpp
src/unix/evtloopunix.cpp
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
<set var="BASE_AND_GUI_OS2_SRC" hints="files">
</set>
<set var="BASE_OS2_HDR" hints="files">
- wx/private/fdiodispatcher.h
- wx/private/selectdispatcher.h
- wx/private/gsocketiohandler.h
wx/unix/app.h
wx/os2/apptbase.h
wx/os2/apptrait.h
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
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
</set>
<set var="BASE_CMN_HDR" hints="files">
wx/afterstd.h
+ wx/anystr.h
wx/app.h
wx/apptrait.h
wx/archive.h
wx/buffer.h
wx/build.h
wx/chartype.h
+ wx/checkeddelete.h
wx/chkconf.h
wx/clntdata.h
wx/cmdargs.h
wx/defs.h
wx/dir.h
wx/dlimpexp.h
+ wx/dlist.h
wx/dynarray.h
wx/dynlib.h
wx/dynload.h
wx/ioswrap.h
wx/ipc.h
wx/ipcbase.h
+ wx/kbdstate.h
wx/link.h
wx/list.h
wx/listimpl.cpp
wx/memtext.h
wx/mimetype.h
wx/module.h
+ wx/mousestate.h
wx/msgout.h
wx/mstream.h
wx/object.h
wx/ptr_shrd.h
wx/recguard.h
wx/regex.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
wx/thread.h
wx/thrimpl.cpp
wx/timer.h
+ wx/tls.h
wx/tokenzr.h
wx/tracker.h
wx/txtstrm.h
<!-- ====================================================================== -->
<set var="NET_UNIX_SRC" hints="files">
- src/unix/gsocket.cpp
+ src/common/socketiohandler.cpp
+ src/unix/sockunix.cpp
</set>
-<set var="NET_UNIX_HDR" hints="files">
- wx/unix/gsockunx.h
+
+<set var="NET_OSX_SRC" hints="files">
+ src/osx/core/sockosx.cpp
</set>
<set var="NET_WIN32_SRC" hints="files">
- src/msw/gsocket.cpp
- src/msw/gsockmsw.cpp
+ src/msw/sockmsw.cpp
src/msw/urlmsw.cpp
</set>
<set var="NET_WIN32_HDR" hints="files">
- wx/msw/gsockmsw.h
+ wx/msw/private/sockmsw.h
</set>
<set var="NET_WINCE_SRC" hints="files">
</set>
<set var="NET_OS2_SRC" hints="files">
- src/unix/gsocket.cpp
-</set>
-<set var="NET_OS2_HDR" hints="files">
- wx/unix/gsockunx.h
+ src/unix/sockunix.cpp
</set>
<set var="NET_CMN_SRC" hints="files">
</set>
<set var="NET_CMN_HDR" hints="files">
wx/fs_inet.h
- wx/gsocket.h
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
src/common/geometry.cpp
src/common/gifdecod.cpp
src/common/graphcmn.cpp
+ src/common/headercolcmn.cpp
+ src/common/headerctrlcmn.cpp
src/common/helpbase.cpp
src/common/iconbndl.cpp
src/common/imagall.cpp
src/common/listctrlcmn.cpp
src/common/matrix.cpp
src/common/menucmn.cpp
+ src/common/mousemanager.cpp
src/common/nbkbase.cpp
src/common/overlaycmn.cpp
src/common/paper.cpp
+ src/common/persist.cpp
src/common/pickerbase.cpp
src/common/popupcmn.cpp
src/common/prntbase.cpp
src/common/quantize.cpp
src/common/radiocmn.cpp
+ src/common/rearrangectrl.cpp
src/common/rendcmn.cpp
src/common/rgncmn.cpp
src/common/settcmn.cpp
src/common/sizer.cpp
+ src/common/spinctrlcmn.cpp
src/common/srchcmn.cpp
src/common/statbar.cpp
src/common/stattextcmn.cpp
src/generic/dirctrlg.cpp
src/generic/dragimgg.cpp
src/generic/filectrlg.cpp
+ src/generic/headerctrlg.cpp
src/generic/listbkg.cpp
src/generic/logg.cpp
src/generic/numdlgg.cpp
src/generic/splitter.cpp
src/generic/srchctlg.cpp
src/generic/statbmpg.cpp
+ src/generic/stattextg.cpp
src/generic/textdlgg.cpp
src/generic/tipwin.cpp
src/generic/toolbkg.cpp
wx/generic/dirctrlg.h
wx/generic/dragimgg.h
wx/generic/filectrlg.h
+ wx/generic/headerctrlg.h
wx/generic/logg.h
wx/generic/msgdlgg.h
wx/generic/numdlgg.h
wx/generic/splitter.h
wx/generic/srchctlg.h
wx/generic/statbmpg.h
+ wx/generic/stattextg.h
wx/generic/textdlgg.h
wx/generic/treectlg.h
wx/graphics.h
+ wx/headercol.h
+ wx/headerctrl.h
wx/helphtml.h
wx/icon.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
wx/position.h
wx/radiobox.h
wx/radiobut.h
+ wx/rearrangectrl.h
wx/renderer.h
wx/scrolbar.h
wx/scrolbar.h
wx/textctrl.h
wx/textdlg.h
wx/textentry.h
+ wx/textwrapper.h
wx/toolbar.h
wx/validate.h
wx/valtext.h
wx/notebook.h
wx/ownerdrw.h
wx/paper.h
+ wx/persist.h
+ wx/persist/bookctrl.h
+ wx/persist/toplevel.h
+ wx/persist/treebook.h
+ wx/persist/window.h
wx/pickerbase.h
wx/popupwin.h
wx/print.h
wx/splitter.h
wx/srchctrl.h
wx/statline.h
- wx/tab.h
- wx/tabctrl.h
wx/tbarbase.h
wx/tglbtn.h
wx/tipwin.h
src/gtk/evtloop.cpp
src/gtk/filectrl.cpp
src/gtk/font.cpp
- src/gtk/gsockgtk.cpp
+ src/gtk/sockgtk.cpp
src/gtk/minifram.cpp
src/gtk/pen.cpp
src/gtk/popupwin.cpp
wx/gtk/dcmemory.h
wx/gtk/dcscreen.h
wx/gtk/dnd.h
+ wx/gtk/evtloop.h
wx/gtk/font.h
wx/gtk/minifram.h
wx/gtk/pen.h
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
<!-- Generic implementations used by wxGPE: -->
src/generic/fontdlgg.cpp
src/generic/msgdlgg.cpp
wx/generic/fontdlgg.h
wx/generic/listctrl.h
wx/generic/statusbr.h
- wx/generic/tabg.h
wx/gtk/accel.h
wx/gtk/bmpbuttn.h
wx/gtk/button.h
src/gtk1/dnd.cpp
src/gtk1/evtloop.cpp
src/gtk1/font.cpp
- src/gtk1/gsockgtk.cpp
+ src/gtk1/sockgtk.cpp
src/gtk1/main.cpp
src/gtk1/minifram.cpp
src/gtk1/pen.cpp
src/generic/msgdlgg.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
<!-- GTK1 specific files: -->
src/gtk1/bmpbuttn.cpp
src/gtk1/button.cpp
wx/generic/fontpickerg.h
wx/generic/listctrl.h
wx/generic/statusbr.h
- wx/generic/tabg.h
wx/gtk1/accel.h
wx/gtk1/bmpbuttn.h
wx/gtk1/button.h
src/motif/font.cpp
src/motif/frame.cpp
src/motif/gauge.cpp
- src/motif/gsockmot.cpp
+ src/motif/sockmot.cpp
src/motif/icon.cpp
src/motif/listbox.cpp
src/motif/main.cpp
- src/motif/mdi.cpp
src/motif/menu.cpp
src/motif/menuitem.cpp
src/motif/minifram.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/listctrl.cpp
+ src/generic/mdig.cpp
src/generic/notebook.cpp
src/generic/prntdlgg.cpp
src/generic/statline.cpp
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/listctrl.h
+ wx/generic/mdig.h
wx/generic/notebook.h
wx/generic/prntdlgg.h
wx/generic/statline.h
wx/motif/gauge.h
wx/motif/icon.h
wx/motif/listbox.h
- wx/motif/mdi.h
wx/motif/menu.h
wx/motif/menuitem.h
wx/motif/minifram.h
<!-- ====================================================================== -->
<set var="MSW_LOWLEVEL_SRC" hints="files">
+ src/msw/ole/activex.cpp
src/msw/app.cpp
src/msw/bitmap.cpp
src/msw/brush.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
src/generic/statusbr.cpp
src/generic/prntdlgg.cpp
src/msw/accel.cpp
+ src/msw/artmsw.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
src/msw/checkbox.cpp
src/msw/filedlg.cpp
src/msw/frame.cpp
src/msw/gauge.cpp
+ src/msw/headerctrl.cpp
src/msw/iniconf.cpp
src/msw/listbox.cpp
src/msw/listctrl.cpp
src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
- src/msw/tabctrl.cpp
src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
wx/msw/frame.h
wx/msw/gauge.h
wx/msw/gdiimage.h
+ wx/msw/headerctrl.h
wx/msw/icon.h
wx/msw/imaglist.h
wx/msw/iniconf.h
wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
- wx/msw/tabctrl.h
wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/mask.cpp
- src/generic/timer.cpp
src/dfb/app.cpp
src/dfb/bitmap.cpp
src/dfb/brush.cpp
src/os2/frame.cpp
src/os2/gauge.cpp
src/os2/gdiimage.cpp
- src/os2/gsockpm.cpp
+ src/os2/sockpm.cpp
src/os2/helpwin.cpp
src/os2/icon.cpp
src/os2/iniconf.cpp
src/os2/statbox.cpp
src/os2/statline.cpp
src/os2/stattext.cpp
- src/os2/tabctrl.cpp
src/os2/textctrl.cpp
src/os2/textentry.cpp
src/os2/tglbtn.cpp
wx/os2/statbox.h
wx/os2/statline.h
wx/os2/stattext.h
- wx/os2/tabctrl.h
wx/os2/textctrl.h
wx/os2/textentry.h
wx/os2/tglbtn.h
<!-- wxMac -->
<!-- ====================================================================== -->
-<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+<set var="OSX_LOWLEVEL_SRC" hints="files">
<!-- Shared wxMac and wxCocoa files -->
+ <if cond="PLATFORM_MACOSX=='1'">
+ src/osx/artmac.cpp
+ src/osx/brush.cpp
+ src/osx/dialog_osx.cpp
+ src/osx/fontutil.cpp
+ src/osx/imaglist.cpp
+ src/osx/minifram.cpp
+ src/osx/nonownedwnd_osx.cpp
+ src/osx/palette.cpp
+ src/osx/pen.cpp
+ src/osx/toplevel_osx.cpp
+ src/osx/utils_osx.cpp
+ <!-- src/osx/treectrl.cpp -->
+ src/osx/window_osx.cpp
+
+ src/osx/core/bitmap.cpp
+ src/osx/core/colour.cpp
+ src/osx/core/dcmemory.cpp
+ src/osx/core/display.cpp
+ src/osx/core/fontenum.cpp
src/osx/core/hid.cpp
+ src/osx/core/printmac.cpp
+ src/osx/core/timer.cpp
src/osx/core/utilsexc_cf.cpp
+ </if>
</set>
-<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+<set var="OSX_LOWLEVEL_HDR" hints="files">
</set>
-<set var="MAC_LOWLEVEL_SRC" hints="files">
- <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
+<!--
+<set var="OSX_LOWLEVEL_SRC" hints="files">
+ <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_SRC)</if>
</set>
-<set var="MAC_LOWLEVEL_HDR" hints="files">
- <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_HDR)</if>
+<set var="OSX_LOWLEVEL_HDR" hints="files">
+ <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_HDR)</if>
</set>
+-->
-<set var="MAC_OSX_SRC" hints="files">
+<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/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/textctrl_osx.cpp
+ src/osx/tglbtn_osx.cpp
+ src/osx/toolbar_osx.cpp
<!-- wxWebKit files -->
src/html/htmlctrl/webkit/webkit.mm
<!-- Native color/font dialogs -->
- src/osx/carbon/fontdlgosx.mm
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
+ src/osx/carbon/gdiobj.cpp
+ src/osx/carbon/icon.cpp
+ src/osx/carbon/app.cpp
+ src/osx/carbon/combobox.cpp
+ src/osx/carbon/control.cpp
+ src/osx/carbon/dataobj.cpp
+ src/osx/carbon/dcclient.cpp
+ src/osx/carbon/dcprint.cpp
+ 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
+ src/osx/carbon/metafile.cpp
+ src/osx/carbon/overlay.cpp
+ src/osx/carbon/popupwin.cpp
+ 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
+ <!-- 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>
-<set var="MAC_SRC" hints="files">
- <!-- osx common files -->
- src/osx/brush.cpp
- src/osx/pen.cpp
- <!-- core files -->
- src/osx/core/colour.cpp
- src/osx/core/timer.cpp
+<set var="OSX_CARBON_SRC" hints="files">
<!-- carbon files -->
- src/osx/carbon/accel.cpp
- src/osx/carbon/app.cpp
- src/osx/carbon/artmac.cpp
- src/osx/carbon/bitmap.cpp
+ $(OSX_CARBON_COCOA_SRC)
src/osx/carbon/bmpbuttn.cpp
src/osx/carbon/button.cpp
src/osx/carbon/checkbox.cpp
- src/osx/carbon/checklst.cpp
src/osx/carbon/choice.cpp
- src/osx/carbon/clipbrd.cpp
src/osx/carbon/colordlg.cpp
- src/osx/carbon/combobox.cpp
- src/osx/carbon/control.cpp
- src/osx/carbon/cursor.cpp
- src/osx/carbon/dataobj.cpp
- src/osx/carbon/dcclient.cpp
- src/osx/carbon/dcmemory.cpp
- src/osx/carbon/dcprint.cpp
- src/osx/carbon/dcscreen.cpp
src/osx/carbon/dialog.cpp
src/osx/carbon/dirdlg.cpp
- src/osx/carbon/display.cpp
- src/osx/carbon/dnd.cpp
src/osx/carbon/evtloop.cpp
src/osx/carbon/filedlg.cpp
- src/osx/carbon/font.cpp
- src/osx/carbon/fontdlg.cpp
- src/osx/carbon/fontenum.cpp
- src/osx/carbon/fontutil.cpp
- src/osx/carbon/frame.cpp
src/osx/carbon/gauge.cpp
- src/osx/carbon/gdiobj.cpp
- src/osx/carbon/graphics.cpp
- src/osx/carbon/icon.cpp
- src/osx/carbon/imaglist.cpp
src/osx/carbon/listbox.cpp
src/osx/carbon/listctrl_mac.cpp
- src/osx/carbon/mdi.cpp
src/osx/carbon/menu.cpp
src/osx/carbon/menuitem.cpp
- src/osx/carbon/metafile.cpp
- src/osx/carbon/minifram.cpp
src/osx/carbon/msgdlg.cpp
src/osx/carbon/nonownedwnd.cpp
src/osx/carbon/notebmac.cpp
- src/osx/carbon/overlay.cpp
- src/osx/carbon/palette.cpp
- src/osx/carbon/popupwin.cpp
src/osx/carbon/printdlg.cpp
- src/osx/carbon/printmac.cpp
- src/osx/carbon/radiobox.cpp
src/osx/carbon/radiobut.cpp
- src/osx/carbon/region.cpp
- src/osx/carbon/renderer.cpp
src/osx/carbon/scrolbar.cpp
- src/osx/carbon/settings.cpp
src/osx/carbon/slider.cpp
src/osx/carbon/spinbutt.cpp
- src/osx/carbon/spinctrl.cpp
src/osx/carbon/srchctrl.cpp
src/osx/carbon/statbmp.cpp
src/osx/carbon/statbox.cpp
- src/osx/carbon/statbrma.cpp
src/osx/carbon/statlmac.cpp
src/osx/carbon/stattext.cpp
- src/osx/carbon/tabctrl.cpp
src/osx/carbon/textctrl.cpp
src/osx/carbon/tglbtn.cpp
src/osx/carbon/toolbar.cpp
src/osx/carbon/tooltip.cpp
- src/osx/carbon/toplevel.cpp
src/osx/carbon/window.cpp
- <!-- Generic implementations used by wxMac: -->
- 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/statusbr.cpp
- src/generic/tabg.cpp
</set>
<!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
-<set var="MAC_CMN_HDR" hints="files">
+<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
wx/osx/statline.h
wx/osx/stattext.h
wx/osx/statusbr.h
- wx/osx/tabctrl.h
wx/osx/taskbarosx.h
wx/osx/textctrl.h
wx/osx/tglbtn.h
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>
<!-- wxMac Carbon header files -->
-<set var="MAC_HDR" hints="files">
+<set var="OSX_CARBON_HDR" hints="files">
<!-- core files -->
wx/osx/core/colour.h
<!-- carbon files -->
- wx/osx/carbon/accel.h
- wx/osx/carbon/app.h
- wx/osx/carbon/bitmap.h
- wx/osx/carbon/bmpbuttn.h
- wx/osx/carbon/button.h
- wx/osx/carbon/checkbox.h
- wx/osx/carbon/checklst.h
wx/osx/carbon/chkconf.h
- wx/osx/carbon/choice.h
- wx/osx/carbon/clipbrd.h
- wx/osx/carbon/colordlg.h
- wx/osx/carbon/combobox.h
- wx/osx/carbon/control.h
- wx/osx/carbon/cursor.h
- wx/osx/carbon/dataform.h
- wx/osx/carbon/dataobj.h
- wx/osx/carbon/dataobj2.h
- wx/osx/carbon/dc.h
- wx/osx/carbon/dcclient.h
- wx/osx/carbon/dcmemory.h
- wx/osx/carbon/dcprint.h
- wx/osx/carbon/dcscreen.h
- wx/osx/carbon/dialog.h
- wx/osx/carbon/dirdlg.h
- wx/osx/carbon/dnd.h
wx/osx/carbon/evtloop.h
- wx/osx/carbon/filedlg.h
- wx/osx/carbon/font.h
- wx/osx/carbon/fontdlg.h
- wx/osx/carbon/frame.h
- wx/osx/carbon/gauge.h
- wx/osx/carbon/helpxxxx.h
- wx/osx/carbon/icon.h
- wx/osx/carbon/imaglist.h
- wx/osx/carbon/listbox.h
- wx/osx/carbon/listctrl.h
- wx/osx/carbon/mdi.h
- wx/osx/carbon/menu.h
- wx/osx/carbon/menuitem.h
- wx/osx/carbon/metafile.h
- wx/osx/carbon/mimetype.h
- wx/osx/carbon/minifram.h
- wx/osx/carbon/msgdlg.h
- wx/osx/carbon/nonownedwnd.h
- wx/osx/carbon/notebook.h
- wx/osx/carbon/palette.h
- wx/osx/carbon/popupwin.h
- wx/osx/carbon/pnghand.h
- wx/osx/carbon/pngread.h
- wx/osx/carbon/printdlg.h
- wx/osx/carbon/printmac.h
wx/osx/carbon/private.h
wx/osx/carbon/private/mactext.h
wx/osx/carbon/private/overlay.h
wx/osx/carbon/private/print.h
- wx/osx/carbon/radiobox.h
- wx/osx/carbon/radiobut.h
wx/osx/carbon/region.h
- wx/osx/carbon/scrolbar.h
- wx/osx/carbon/slider.h
- wx/osx/carbon/spinbutt.h
- wx/osx/carbon/spinctrl.h
- wx/osx/carbon/srchctrl.h
wx/osx/carbon/statbmp.h
- wx/osx/carbon/statbox.h
- wx/osx/carbon/statline.h
- wx/osx/carbon/stattext.h
- wx/osx/carbon/statusbr.h
- wx/osx/carbon/tabctrl.h
- wx/osx/carbon/textctrl.h
- wx/osx/carbon/tglbtn.h
- wx/osx/carbon/toolbar.h
- wx/osx/carbon/tooltip.h
- wx/osx/carbon/toplevel.h
- wx/osx/carbon/treectrl.h
wx/osx/carbon/uma.h
- wx/osx/carbon/window.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
- wx/generic/tabg.h
- <!-- wxWebKit headers -->
- wx/html/webkit.h
</set>
+<!-- ====================================================================== -->
+<!-- wxMac/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/dialog.mm
+ src/osx/cocoa/dirdlg.mm
+ src/osx/cocoa/evtloop.mm
+ src/osx/cocoa/filedlg.mm
+ src/osx/cocoa/gauge.mm
+ src/osx/cocoa/listbox.mm
+ src/osx/cocoa/menu.mm
+ src/osx/cocoa/menuitem.mm
+ src/osx/cocoa/msgdlg.mm
+ src/osx/cocoa/nonownedwnd.mm
+ src/osx/cocoa/notebook.mm
+ src/osx/cocoa/radiobut.mm
+ src/osx/cocoa/printdlg.mm
+ src/osx/cocoa/scrolbar.mm
+ src/osx/cocoa/slider.mm
+ src/osx/cocoa/spinbutt.mm
+ src/osx/cocoa/srchctrl.mm
+ src/osx/cocoa/statbox.mm
+ src/osx/cocoa/statline.mm
+ src/osx/cocoa/stattext.mm
+ src/osx/cocoa/textctrl.mm
+ src/osx/cocoa/tglbtn.mm
+ src/osx/cocoa/toolbar.mm
+ src/osx/cocoa/tooltip.mm
+ src/osx/cocoa/window.mm
+</set>
+<set var="OSX_COCOA_HDR" hints="files">
+ wx/osx/cocoa/chkconf.h
+ wx/osx/cocoa/evtloop.h
+ wx/osx/cocoa/private.h
+ $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
+ wx/generic/region.h
+</set>
+
+<!-- ====================================================================== -->
+<!-- wxMac/iPhone -->
+<!-- ====================================================================== -->
+
+<set var="OSX_IPHONE_SRC" hints="files">
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+</set>
<!-- ====================================================================== -->
<!-- wxCocoa -->
src/generic/paletteg.cpp
src/generic/regiong.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSApplication.h
wx/cocoa/dialog.h
wx/cocoa/dirdlg.h
wx/cocoa/drawer.h
+ wx/cocoa/evtloop.h
wx/cocoa/filedlg.h
wx/cocoa/font.h
wx/cocoa/fontdlg.h
wx/generic/paletteg.h
wx/generic/region.h
wx/generic/statusbr.h
- wx/generic/tabg.h
</set>
src/generic/mdig.cpp
src/generic/msgdlgg.cpp
src/generic/prntdlgg.cpp
- src/generic/tabg.cpp
src/univ/bmpbuttn.cpp
src/univ/button.cpp
src/univ/checkbox.cpp
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/statusbr.h
- wx/generic/tabg.h
wx/univ/app.h
wx/univ/bmpbuttn.h
wx/univ/button.h
src/generic/editlbox.cpp
src/generic/grid.cpp
src/generic/gridctrl.cpp
+ src/generic/grideditors.cpp
src/generic/gridsel.cpp
src/generic/helpext.cpp
src/generic/hyperlinkg.cpp
wx/generic/dataview.h
wx/generic/grid.h
wx/generic/gridctrl.h
+ wx/generic/grideditors.h
wx/generic/gridsel.h
wx/generic/helpext.h
wx/generic/hyperlink.h
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
- src/generic/animateg.cpp
src/msw/aboutdlg.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/notifmsg.h
wx/msw/sound.h
wx/msw/taskbar.h
<!-- 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/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/calctrl.h
- wx/msw/datecontrols.h
wx/msw/datectrl.h
</set>
wx/msw/joystick.h
</set>
-<set var="ADVANCED_MAC_SRC" hints="files">
+<set var="ADVANCED_OSX_CARBON_SRC" hints="files">
src/common/taskbarcmn.cpp
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/carbon/sound.cpp
src/osx/carbon/taskbar.cpp
src/osx/core/hidjoystick.cpp
</set>
-<set var="ADVANCED_MAC_HDR" hints="files">
+
+<set var="ADVANCED_OSX_CARBON_HDR" hints="files">
wx/generic/animate.h
wx/osx/dataview.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/carbon/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>
+
+<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
+ wx/generic/animate.h
+ wx/osx/dataview.h
+ wx/osx/joystick.h
+ wx/osx/sound.h
+ wx/osx/taskbarosx.h
+ wx/osx/core/joystick.h
+ wx/osx/cocoa/dataview.h
+</set>
+
<set var="ADVANCED_COCOA_SRC" hints="files">
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/osx/core/hidjoystick.cpp
</set>
+
<set var="ADVANCED_COCOA_HDR" hints="files">
wx/cocoa/taskbar.h
wx/generic/animate.h
</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">
src/msw/mediactrl_am.cpp
src/msw/mediactrl_wmp10.cpp
src/msw/mediactrl_qt.cpp
- src/msw/ole/activex.cpp
</set>
<set var="MEDIA_MSW_HDR" hints="files">
- wx/msw/ole/activex.h
</set>
<!-- not built on WindowsCE: -->
<set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
<set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
</set>
-<set var="MEDIA_MAC_SRC" hints="files">
+<set var="MEDIA_OSX_CARBON_SRC" hints="files">
src/osx/carbon/mediactrl.cpp
</set>
-<set var="MEDIA_MAC_HDR" hints="files">
+<set var="MEDIA_OSX_CARBON_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OSX_COCOA_SRC" hints="files">
+ <!-- src/osx/cocoa/mediactrl.mm -->
+</set>
+<set var="MEDIA_OSX_COCOA_HDR" hints="files">
</set>
<set var="MEDIA_COCOA_SRC" hints="files">
src/xrc/xh_clrpicker.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
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
wx/xrc/xh_clrpicker.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
<!-- ====================================================================== -->
<set var="OPENGL_SRC_PLATFORM" hints="files">
- <if cond="TOOLKIT=='MAC'">src/osx/carbon/glcanvas.cpp</if>
+ <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=='COCOA'">src/cocoa/glcanvas.mm</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
src/gtk/glcanvas.cpp
</set>
<set var="OPENGL_HDR_PLATFORM" hints="files">
- <if cond="TOOLKIT=='MAC'">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
src/aui/dockart.cpp
src/aui/floatpane.cpp
src/aui/auibook.cpp
+ src/aui/auibar.cpp
src/aui/tabmdi.cpp
</set>
<set var="AUI_HDR" hints="files">
wx/aui/dockart.h
wx/aui/floatpane.h
wx/aui/auibook.h
+ wx/aui/auibar.h
wx/aui/tabmdi.h
wx/aui/aui.h
</set>
+<!-- ====================================================================== -->
+<!-- wxPropertyGrid -->
+<!-- ====================================================================== -->
+
+<set var="PROPGRID_SRC" hints="files">
+ src/propgrid/advprops.cpp
+ src/propgrid/editors.cpp
+ src/propgrid/manager.cpp
+ src/propgrid/property.cpp
+ src/propgrid/propgrid.cpp
+ src/propgrid/propgridiface.cpp
+ src/propgrid/propgridpagestate.cpp
+ src/propgrid/props.cpp
+</set>
+<set var="PROPGRID_HDR" hints="files">
+ wx/propgrid/advprops.h
+ wx/propgrid/editors.h
+ wx/propgrid/manager.h
+ wx/propgrid/property.h
+ wx/propgrid/propgrid.h
+ wx/propgrid/propgriddefs.h
+ wx/propgrid/propgridiface.h
+ wx/propgrid/propgridpagestate.h
+ wx/propgrid/props.h
+</set>
+
<!-- ====================================================================== -->
<!-- wxRichTextCtrl -->
<!-- ====================================================================== -->
<!-- Nested if would be nicer, but this works -->
<!-- These are the files for PLATFORM_MACOSX -->
- <set var="BASE_MACOSX_SRC" hints="files">
- <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
- <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
- <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
- <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
- <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+ <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=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
Mac; once fixed, this would no longer be needed -->
- <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+ <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_SRC)</if>
</set>
<set var="BASE_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
<if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
</set>
<set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
- <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+ <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_AND_GUI_OSX_CARBON_SRC)</if>
+ <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_AND_GUI_OSX_COCOA_SRC)</if>
</set>
<set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
<!-- Nested if would be nicer, but this works -->
<!-- These are the files for PLATFORM_MACOSX -->
- <set var="BASE_MACOSX_HDR" hints="files">
- <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
- <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
- <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
- <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
- <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+ <set var="BASE_OSX_HDR" hints="files">
+ <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_HDR)</if>
+ <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_HDR)</if>
+ <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
Mac; once fixed, this would no longer be needed -->
- <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+ <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_HDR)</if>
</set>
<set var="BASE_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
<if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
<if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
<if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
<set var="NET_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_SRC)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
</set>
<set var="NET_PLATFORM_HDR" hints="files">
- <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
- <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
- <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if>
+ <if cond="TOOLKIT=='OSX_COCOA'">$(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>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
- <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if>
+ <if cond="TOOLKIT=='OSX_COCOA'">$(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>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
- <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
+ <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if>
+ <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
- <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_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=='COCOA'">$(COCOA_HDR)</if>
<if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
</set>
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
- <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_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=='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>
<set var="ADVANCED_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
- <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_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=='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>
<set var="MEDIA_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
- <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_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=='COCOA'">$(MEDIA_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
<set var="MEDIA_PLATFORM_HDR" hints="files">
<if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
- <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+ <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_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>
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
- $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
- $(STC_HDR)
+ $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+ $(RICHTEXT_HDR) $(STC_HDR)
</if>
</set>
<!-- for 'make install', only the headers needed for the installed port -->
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
- $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
+ $(NET_CMN_HDR)
$(XML_HDR)
</set>
<set var="ALL_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
- $(BASE_MACOSX_HDR)
+ $(BASE_OSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(NET_CMN_HDR)
- $(NET_UNIX_HDR)
- $(NET_WIN32_HDR) $(NET_WINCE_HDR)
- $(NET_OS2_HDR)
- $(NET_UNIX_HDR)
$(XML_HDR)
</set>
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
$(BASE_CMN_SRC)
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
- $(BASE_MAC_SRC)
+ $(BASE_OSX_SRC)
$(BASE_OS2_SRC)
$(BASE_MSDOS_SRC)
$(BASE_PALMOS_SRC)
$(BASE_AND_GUI_CMN_SRC)
- $(BASE_AND_GUI_MAC_SRC)
+ $(BASE_AND_GUI_OSX_CARBON_SRC)
+ $(BASE_AND_GUI_OSX_COCOA_SRC)
$(BASE_AND_GUI_WIN32_SRC)
- $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
+ $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_OSX_SRC)
+ $(NET_WIN32_SRC) $(NET_WINCE_SRC)
$(XML_SRC)
</set>
projects / wxWidgets.git / blobdiff