X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db7035e48a4ccc6265fa01949cb92db3c6b6c17f..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/bakefiles/files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 98e8bf0153..cd4598a3b8 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -58,13 +58,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/fdiodispatcher.cpp
src/common/selectdispatcher.cpp
+ src/unix/epolldispatcher.cpp
src/unix/appunix.cpp
- src/unix/baseunix.cpp
src/unix/evtloopunix.cpp
+ src/unix/dir.cpp
src/unix/dlunix.cpp
src/unix/snglinst.cpp
src/unix/stdpaths.cpp
src/unix/timerunx.cpp
+ src/unix/threadpsx.cpp
+ src/unix/stackwalk.cpp
+ src/unix/utilsunx.cpp
@@ -77,6 +81,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/unix/evtloop.h
wx/unix/pipe.h
wx/unix/stdpaths.h
+ wx/unix/stackwalk.h
+ wx/unix/tls.h
$(BASE_UNIX_AND_DARWIN_SRC)
- src/unix/dir.cpp
src/unix/mimetype.cpp
- src/unix/threadpsx.cpp
$(BASE_UNIX_AND_DARWIN_HDR)
wx/unix/execute.h
wx/unix/mimetype.h
- wx/unix/private.h
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
- src/common/gsocketiohandler.cpp
- src/unix/epolldispatcher.cpp
- src/unix/stackwalk.cpp
-
-
- src/unix/utilsunx.cpp
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
- wx/private/gsocketiohandler.h
- wx/unix/stackwalk.h
@@ -183,81 +178,49 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
- src/mac/corefoundation/cfstring.cpp
- src/mac/corefoundation/gsockosx.cpp
- src/mac/corefoundation/stdpaths_cf.cpp
- src/mac/corefoundation/strconv_cf.cpp
- src/mac/corefoundation/utilsexc_base.cpp
+ src/osx/core/cfstring.cpp
+ src/osx/core/stdpaths_cf.cpp
+ src/osx/core/strconv_cf.cpp
+ src/osx/core/utilsexc_base.cpp
- wx/mac/corefoundation/cfdataref.h
- wx/mac/corefoundation/cfref.h
- wx/mac/corefoundation/cfstring.h
- wx/mac/corefoundation/hid.h
- wx/mac/corefoundation/stdpaths.h
- wx/mac/corefoundation/private/strconv_cf.h
-
-
-
-
-
- src/mac/carbon/dirmac.cpp
- src/mac/carbon/mimetmac.cpp
- src/mac/carbon/thread.cpp
-
- src/mac/carbon/morefilex/MoreFilesX.c
+ wx/osx/core/cfdataref.h
+ 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
+
+
+
+
+ src/osx/core/mimetype.cpp
$(BASE_COREFOUNDATION_SRC)
+ $(BASE_UNIX_AND_DARWIN_SRC)
-
+
$(BASE_COREFOUNDATION_HDR)
+ $(BASE_UNIX_AND_DARWIN_HDR)
-
-
- src/mac/carbon/utils.cpp
- src/mac/carbon/uma.cpp
-
-
-
-
-
-
-
-
- src/mac/carbon/morefile/DirectoryCopy.c
- src/mac/carbon/morefile/FSpCompat.c
- src/mac/carbon/morefile/FileCopy.c
- src/mac/carbon/morefile/FullPath.c
- src/mac/carbon/morefile/IterateDirectory.c
- src/mac/carbon/morefile/MoreDesktopMgr.c
- src/mac/carbon/morefile/MoreFiles.c
- src/mac/carbon/morefile/MoreFilesExtras.c
- src/mac/carbon/morefile/Search.c
- src/mac/carbon/utilsexc.cpp
-
-
-
-
-
- $(BASE_MAC_SRC)
- $(BASE_UNIX_AND_DARWIN_SRC)
+
+
+ src/osx/carbon/utils.cpp
+ src/osx/carbon/uma.cpp
-
- $(BASE_MAC_HDR)
- $(BASE_UNIX_AND_DARWIN_HDR)
+
+
+ src/osx/cocoa/utils.mm
-
+
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
$(BASE_COREFOUNDATION_SRC)
-
+
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
@@ -282,8 +245,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- wx/private/fdiodispatcher.h
- wx/private/selectdispatcher.h
wx/unix/app.h
wx/os2/apptbase.h
wx/os2/apptrait.h
@@ -410,10 +371,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/txtstrm.cpp
src/common/unichar.cpp
src/common/uri.cpp
+ src/common/ustring.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxcrt.cpp
src/common/wxprintf.cpp
+ src/common/xlocale.cpp
src/common/xti.cpp
src/common/xtistrm.cpp
src/common/zipstrm.cpp
@@ -455,6 +418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/defs.h
wx/dir.h
wx/dlimpexp.h
+ wx/dlist.h
wx/dynarray.h
wx/dynlib.h
wx/dynload.h
@@ -486,6 +450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/ioswrap.h
wx/ipc.h
wx/ipcbase.h
+ wx/kbdstate.h
wx/link.h
wx/list.h
wx/listimpl.cpp
@@ -497,6 +462,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/memtext.h
wx/mimetype.h
wx/module.h
+ wx/mousestate.h
wx/msgout.h
wx/mstream.h
wx/object.h
@@ -505,6 +471,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/power.h
wx/process.h
wx/ptr_scpd.h
+ wx/ptr_shrd.h
wx/recguard.h
wx/regex.h
wx/scopeguard.h
@@ -528,12 +495,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/thread.h
wx/thrimpl.cpp
wx/timer.h
+ wx/tls.h
wx/tokenzr.h
wx/tracker.h
wx/txtstrm.h
wx/types.h
wx/unichar.h
wx/uri.h
+ wx/ustring.h
wx/utils.h
wx/variant.h
wx/vector.h
@@ -547,10 +516,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/wxcrtbase.h
wx/wxcrtvararg.h
wx/wxprec.h
+ wx/xlocale.h
wx/xti.h
wx/xtistrm.h
wx/zipstrm.h
wx/zstream.h
+ wx/meta/convertible.h
+ wx/meta/if.h
+ wx/meta/int2type.h
+ wx/meta/movable.h
@@ -559,19 +533,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/unix/gsocket.cpp
+ src/common/socketiohandler.cpp
+ src/unix/sockunix.cpp
-
- wx/unix/gsockunx.h
+
+
+ src/osx/core/sockosx.cpp
- src/msw/gsocket.cpp
- src/msw/gsockmsw.cpp
+ src/msw/sockmsw.cpp
src/msw/urlmsw.cpp
- wx/msw/gsockmsw.h
+ wx/msw/private/sockmsw.h
@@ -582,17 +557,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/unix/gsocket.cpp
-
-
- wx/unix/gsockunx.h
-
-
-
- src/mac/carbon/gsocket.cpp
-
-
- wx/mac/carbon/gsockmac.h
+ src/unix/sockunix.cpp
@@ -609,7 +574,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/fs_inet.h
- wx/gsocket.h
wx/protocol/file.h
wx/protocol/ftp.h
wx/protocol/http.h
@@ -689,6 +653,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -717,10 +683,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -735,6 +703,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/valtext.cpp
src/common/wincmn.cpp
src/common/windowid.cpp
+ src/common/wrapsizer.cpp
src/common/xpmdecod.cpp
src/generic/busyinfo.cpp
src/generic/buttonbar.cpp
@@ -745,6 +714,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -757,6 +727,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/spinctlg.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
@@ -806,6 +778,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -818,9 +791,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/spinctlg.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
@@ -828,6 +805,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/mdi.h
wx/menu.h
wx/msgdlg.h
+ wx/nativewin.h
wx/numdlg.h
wx/overlay.h
wx/palette.h
@@ -836,6 +814,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/position.h
wx/radiobox.h
wx/radiobut.h
+ wx/rearrangectrl.h
wx/renderer.h
wx/scrolbar.h
wx/scrolbar.h
@@ -856,6 +835,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/valtext.h
wx/window.h
wx/windowid.h
+ wx/wrapsizer.h
wx/wupdlock.h
wx/accel.h
@@ -932,7 +912,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/printdlg.h
wx/prntbase.h
wx/progdlg.h
- wx/ptr_scpd.h
wx/quantize.h
wx/rawbmp.h
wx/region.h
@@ -942,8 +921,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/splitter.h
wx/srchctrl.h
wx/statline.h
- wx/tab.h
- wx/tabctrl.h
wx/tbarbase.h
wx/tglbtn.h
wx/tipwin.h
@@ -962,6 +939,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xpmhand.h
+
+
+
+
+
+ src/unix/apptraits.cpp
+
@@ -1008,10 +992,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
+ src/gtk/private.cpp
src/gtk/region.cpp
src/gtk/renderer.cpp
src/gtk/settings.cpp
@@ -1041,14 +1026,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
wx/gtk/popupwin.h
+ wx/gtk/private/win_gtk.h
wx/gtk/region.h
wx/gtk/tooltip.h
wx/gtk/toplevel.h
- wx/gtk/win_gtk.h
wx/gtk/window.h
@@ -1061,7 +1047,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
src/generic/fontdlgg.cpp
src/generic/msgdlgg.cpp
@@ -1093,6 +1078,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/menu.cpp
src/gtk/mnemonics.cpp
src/gtk/msgdlg.cpp
+ src/gtk/nativewin.cpp
src/gtk/notebook.cpp
src/gtk/radiobox.cpp
src/gtk/radiobut.cpp
@@ -1117,7 +1103,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1163,7 +1148,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk/textctrl.h
wx/gtk/textentry.h
wx/gtk/tglbtn.h
- wx/gtk/treectrl.h
wx/gtk/treeentry_gtk.h
@@ -1191,7 +1175,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1250,7 +1234,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/msgdlgg.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
src/gtk1/bmpbuttn.cpp
src/gtk1/button.cpp
@@ -1295,7 +1278,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1381,11 +1363,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1418,6 +1399,7 @@ 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/mdig.cpp
src/generic/notebook.cpp
src/generic/prntdlgg.cpp
src/generic/statline.cpp
@@ -1435,6 +1417,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1471,7 +1454,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1645,6 +1627,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -1658,7 +1641,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/dragimag.cpp
src/msw/filedlg.cpp
src/msw/frame.cpp
- src/msw/gauge95.cpp
+ src/msw/gauge.cpp
+ src/msw/headerctrl.cpp
src/msw/iniconf.cpp
src/msw/listbox.cpp
src/msw/listctrl.cpp
@@ -1668,22 +1652,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/metafile.cpp
src/msw/msgdlg.cpp
src/msw/nativdlg.cpp
+ src/msw/nativewin.cpp
src/msw/notebook.cpp
src/msw/ole/access.cpp
+ src/msw/ole/activex.cpp
src/msw/ownerdrw.cpp
src/msw/radiobox.cpp
src/msw/radiobut.cpp
src/msw/scrolbar.cpp
- src/msw/slider95.cpp
+ src/msw/slider.cpp
src/msw/spinbutt.cpp
src/msw/spinctrl.cpp
src/msw/statbmp.cpp
src/msw/statbox.cpp
- src/msw/statbr95.cpp
+ src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
- src/msw/tabctrl.cpp
- src/msw/tbar95.cpp
+ src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
src/msw/tglbtn.cpp
@@ -1725,8 +1710,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/filedlg.h
wx/msw/font.h
wx/msw/frame.h
- wx/msw/gauge95.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
@@ -1742,6 +1728,7 @@ 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
@@ -1758,16 +1745,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/rcdefs.h
wx/msw/scrolbar.h
wx/msw/setup0.h
- wx/msw/slider95.h
+ wx/msw/slider.h
wx/msw/spinbutt.h
wx/msw/spinctrl.h
wx/msw/statbmp.h
wx/msw/statbox.h
- wx/msw/statbr95.h
+ wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
- wx/msw/tabctrl.h
- wx/msw/tbar95.h
+ wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h
wx/msw/tglbtn.h
@@ -2040,7 +2026,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2049,6 +2035,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/os2/menu.cpp
src/os2/menuitem.cpp
src/os2/metafile.cpp
+ src/os2/minifram.cpp
src/os2/msgdlg.cpp
src/os2/nativdlg.cpp
src/os2/notebook.cpp
@@ -2069,7 +2056,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2148,7 +2134,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2164,114 +2149,147 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
+
- src/mac/corefoundation/hid.cpp
- src/mac/corefoundation/utilsexc_cf.cpp
+
+ src/osx/accel.cpp
+ src/osx/bmpbuttn_osx.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/utils_osx.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
+
-
+
-
- $(MAC_OSX_LOWLEVEL_SRC)
+
-
+
- src/html/htmlctrl/webkit/webkit.mm
+
- src/mac/carbon/fontdlgosx.mm
- src/mac/carbon/colordlgosx.mm
+ src/osx/carbon/colordlgosx.mm
+ src/osx/carbon/fontdlgosx.mm
+
+ 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/mac/carbon/utilscocoa.mm
+ src/osx/carbon/utilscocoa.mm
-
- src/mac/carbon/accel.cpp
- src/mac/carbon/aga.cpp
- src/mac/carbon/app.cpp
- src/mac/carbon/artmac.cpp
- src/mac/carbon/bitmap.cpp
- src/mac/carbon/bmpbuttn.cpp
- src/mac/carbon/brush.cpp
- src/mac/carbon/button.cpp
- src/mac/carbon/checkbox.cpp
- src/mac/carbon/checklst.cpp
- src/mac/carbon/choice.cpp
- src/mac/carbon/clipbrd.cpp
- src/mac/carbon/colordlg.cpp
- src/mac/carbon/colour.cpp
- src/mac/carbon/combobox.cpp
- src/mac/carbon/control.cpp
- src/mac/carbon/cursor.cpp
- src/mac/carbon/data.cpp
- src/mac/carbon/dataobj.cpp
- src/mac/carbon/dc.cpp
- src/mac/carbon/dccg.cpp
- src/mac/carbon/dcclient.cpp
- src/mac/carbon/dcmemory.cpp
- src/mac/carbon/dcprint.cpp
- src/mac/carbon/dcscreen.cpp
- src/mac/carbon/dialog.cpp
- src/mac/carbon/dirdlg.cpp
- src/mac/carbon/display.cpp
- src/mac/carbon/dnd.cpp
- src/mac/carbon/evtloop.cpp
- src/mac/carbon/filedlg.cpp
- src/mac/carbon/font.cpp
- src/mac/carbon/fontdlg.cpp
- src/mac/carbon/fontenum.cpp
- src/mac/carbon/fontutil.cpp
- src/mac/carbon/frame.cpp
- src/mac/carbon/gauge.cpp
- src/mac/carbon/gdiobj.cpp
- src/mac/carbon/graphics.cpp
- src/mac/carbon/icon.cpp
- src/mac/carbon/imaglist.cpp
- src/mac/carbon/listbox.cpp
- src/mac/carbon/listctrl_mac.cpp
- src/mac/carbon/mdi.cpp
- src/mac/carbon/menu.cpp
- src/mac/carbon/menuitem.cpp
- src/mac/carbon/metafile.cpp
- src/mac/carbon/minifram.cpp
- src/mac/carbon/msgdlg.cpp
- src/mac/carbon/notebmac.cpp
- src/mac/carbon/overlay.cpp
- src/mac/carbon/palette.cpp
- src/mac/carbon/pen.cpp
- src/mac/carbon/popupwin.cpp
- src/mac/carbon/printdlg.cpp
- src/mac/carbon/printmac.cpp
- src/mac/carbon/radiobox.cpp
- src/mac/carbon/radiobut.cpp
- src/mac/carbon/region.cpp
- src/mac/carbon/renderer.cpp
- src/mac/carbon/scrolbar.cpp
- src/mac/carbon/settings.cpp
- src/mac/carbon/slider.cpp
- src/mac/carbon/spinbutt.cpp
- src/mac/carbon/spinctrl.cpp
- src/mac/carbon/srchctrl.cpp
- src/mac/carbon/statbmp.cpp
- src/mac/carbon/statbox.cpp
- src/mac/carbon/statbrma.cpp
- src/mac/carbon/statlmac.cpp
- src/mac/carbon/stattext.cpp
- src/mac/carbon/tabctrl.cpp
- src/mac/carbon/textctrl.cpp
- src/mac/carbon/timer.cpp
- src/mac/carbon/tglbtn.cpp
- src/mac/carbon/toolbar.cpp
- src/mac/carbon/tooltip.cpp
- src/mac/carbon/toplevel.cpp
- src/mac/carbon/window.cpp
+
+
+ $(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
src/generic/caret.cpp
src/generic/clrpickerg.cpp
@@ -2283,178 +2301,102 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
-
-
- wx/mac/accel.h
- wx/mac/aga.h
- wx/mac/app.h
- wx/mac/bitmap.h
- wx/mac/bmpbuttn.h
- wx/mac/brush.h
- wx/mac/button.h
- wx/mac/checkbox.h
- wx/mac/checklst.h
- wx/mac/chkconf.h
- wx/mac/choice.h
- wx/mac/clipbrd.h
- wx/mac/colordlg.h
- wx/mac/colour.h
- wx/mac/combobox.h
- wx/mac/control.h
- wx/mac/cursor.h
- wx/mac/dataform.h
- wx/mac/dataobj.h
- wx/mac/dataobj2.h
- wx/mac/dc.h
- wx/mac/dcclient.h
- wx/mac/dcmemory.h
- wx/mac/dcprint.h
- wx/mac/dcscreen.h
- wx/mac/dialog.h
- wx/mac/dirdlg.h
- wx/mac/dnd.h
- wx/mac/evtloop.h
- wx/mac/filedlg.h
- wx/mac/font.h
- wx/mac/fontdlg.h
- wx/mac/frame.h
- wx/mac/gauge.h
- wx/mac/gsockmac.h
- wx/mac/helpxxxx.h
- wx/mac/icon.h
- wx/mac/imaglist.h
- wx/mac/listbox.h
- wx/mac/listctrl.h
- wx/mac/macnotfy.h
- wx/mac/macsock.h
- wx/mac/mdi.h
- wx/mac/menu.h
- wx/mac/menuitem.h
- wx/mac/metafile.h
- wx/mac/mimetype.h
- wx/mac/minifram.h
- wx/mac/msgdlg.h
- wx/mac/notebook.h
- wx/mac/palette.h
- wx/mac/pen.h
- wx/mac/popupwin.h
- wx/mac/pnghand.h
- wx/mac/pngread.h
- wx/mac/printdlg.h
- wx/mac/printmac.h
- wx/mac/private.h
- wx/mac/radiobox.h
- wx/mac/radiobut.h
- wx/mac/region.h
- wx/mac/scrolbar.h
- wx/mac/slider.h
- wx/mac/spinbutt.h
- wx/mac/spinctrl.h
- wx/mac/srchctrl.h
- wx/mac/statbmp.h
- wx/mac/statbox.h
- wx/mac/statline.h
- wx/mac/stattext.h
- wx/mac/statusbr.h
- wx/mac/tabctrl.h
- wx/mac/taskbarosx.h
- wx/mac/textctrl.h
- wx/mac/tglbtn.h
- wx/mac/toolbar.h
- wx/mac/tooltip.h
- wx/mac/toplevel.h
- wx/mac/treectrl.h
- wx/mac/uma.h
- wx/mac/window.h
+
+
+ wx/osx/accel.h
+ wx/osx/app.h
+ wx/osx/bitmap.h
+ wx/osx/bmpbuttn.h
+ wx/osx/brush.h
+ wx/osx/button.h
+ wx/osx/checkbox.h
+ wx/osx/checklst.h
+ wx/osx/chkconf.h
+ wx/osx/choice.h
+ wx/osx/clipbrd.h
+ wx/osx/colordlg.h
+ wx/osx/colour.h
+ wx/osx/combobox.h
+ wx/osx/control.h
+ wx/osx/cursor.h
+ wx/osx/dataform.h
+ wx/osx/dataobj.h
+ wx/osx/dataobj2.h
+ wx/osx/dc.h
+ wx/osx/dcclient.h
+ wx/osx/dcmemory.h
+ wx/osx/dcprint.h
+ wx/osx/dcscreen.h
+ wx/osx/dialog.h
+ wx/osx/dirdlg.h
+ wx/osx/dnd.h
+ wx/osx/evtloop.h
+ wx/osx/filedlg.h
+ wx/osx/font.h
+ wx/osx/fontdlg.h
+ wx/osx/frame.h
+ wx/osx/gauge.h
+ wx/osx/helpxxxx.h
+ wx/osx/icon.h
+ wx/osx/imaglist.h
+ wx/osx/listbox.h
+ wx/osx/listctrl.h
+ wx/osx/mdi.h
+ wx/osx/menu.h
+ wx/osx/menuitem.h
+ wx/osx/metafile.h
+ wx/osx/mimetype.h
+ wx/osx/minifram.h
+ wx/osx/msgdlg.h
+ wx/osx/nonownedwnd.h
+ wx/osx/notebook.h
+ wx/osx/palette.h
+ wx/osx/pen.h
+ wx/osx/popupwin.h
+ wx/osx/pnghand.h
+ wx/osx/pngread.h
+ wx/osx/printdlg.h
+ wx/osx/printmac.h
+ wx/osx/private.h
+ wx/osx/radiobox.h
+ wx/osx/radiobut.h
+ wx/osx/region.h
+ wx/osx/scrolbar.h
+ wx/osx/slider.h
+ wx/osx/spinbutt.h
+ wx/osx/spinctrl.h
+ wx/osx/srchctrl.h
+ wx/osx/statbmp.h
+ wx/osx/statbox.h
+ wx/osx/statline.h
+ wx/osx/stattext.h
+ wx/osx/statusbr.h
+ wx/osx/taskbarosx.h
+ wx/osx/textctrl.h
+ wx/osx/tglbtn.h
+ wx/osx/toolbar.h
+ wx/osx/tooltip.h
+ wx/osx/toplevel.h
+ wx/osx/treectrl.h
+ wx/osx/uma.h
+ wx/osx/window.h
-
- wx/mac/carbon/accel.h
- wx/mac/carbon/aga.h
- wx/mac/carbon/app.h
- wx/mac/carbon/bitmap.h
- wx/mac/carbon/bmpbuttn.h
- wx/mac/carbon/brush.h
- wx/mac/carbon/button.h
- wx/mac/carbon/checkbox.h
- wx/mac/carbon/checklst.h
- wx/mac/carbon/chkconf.h
- wx/mac/carbon/choice.h
- wx/mac/carbon/clipbrd.h
- wx/mac/carbon/colordlg.h
- wx/mac/carbon/colour.h
- wx/mac/carbon/combobox.h
- wx/mac/carbon/control.h
- wx/mac/carbon/cursor.h
- wx/mac/carbon/dataform.h
- wx/mac/carbon/dataobj.h
- wx/mac/carbon/dataobj2.h
- wx/mac/carbon/dc.h
- wx/mac/carbon/dcclient.h
- wx/mac/carbon/dcmemory.h
- wx/mac/carbon/dcprint.h
- wx/mac/carbon/dcscreen.h
- wx/mac/carbon/dialog.h
- wx/mac/carbon/dirdlg.h
- wx/mac/carbon/dnd.h
- wx/mac/carbon/evtloop.h
- wx/mac/carbon/filedlg.h
- wx/mac/carbon/font.h
- wx/mac/carbon/fontdlg.h
- wx/mac/carbon/frame.h
- wx/mac/carbon/gauge.h
- wx/mac/carbon/gsockmac.h
- wx/mac/carbon/helpxxxx.h
- wx/mac/carbon/icon.h
- wx/mac/carbon/imaglist.h
- wx/mac/carbon/listbox.h
- wx/mac/carbon/listctrl.h
- wx/mac/carbon/macnotfy.h
- wx/mac/carbon/macsock.h
- wx/mac/carbon/mdi.h
- wx/mac/carbon/menu.h
- wx/mac/carbon/menuitem.h
- wx/mac/carbon/metafile.h
- wx/mac/carbon/mimetype.h
- wx/mac/carbon/minifram.h
- wx/mac/carbon/msgdlg.h
- wx/mac/carbon/notebook.h
- wx/mac/carbon/palette.h
- wx/mac/carbon/pen.h
- wx/mac/carbon/popupwin.h
- wx/mac/carbon/pnghand.h
- wx/mac/carbon/pngread.h
- wx/mac/carbon/printdlg.h
- wx/mac/carbon/printmac.h
- wx/mac/carbon/private.h
- wx/mac/carbon/private/mactext.h
- wx/mac/carbon/private/overlay.h
- wx/mac/carbon/private/print.h
- wx/mac/carbon/radiobox.h
- wx/mac/carbon/radiobut.h
- wx/mac/carbon/region.h
- wx/mac/carbon/scrolbar.h
- wx/mac/carbon/slider.h
- wx/mac/carbon/spinbutt.h
- wx/mac/carbon/spinctrl.h
- wx/mac/carbon/srchctrl.h
- wx/mac/carbon/statbmp.h
- wx/mac/carbon/statbox.h
- wx/mac/carbon/statline.h
- wx/mac/carbon/stattext.h
- wx/mac/carbon/statusbr.h
- wx/mac/carbon/tabctrl.h
- wx/mac/carbon/textctrl.h
- wx/mac/carbon/tglbtn.h
- wx/mac/carbon/toolbar.h
- wx/mac/carbon/tooltip.h
- wx/mac/carbon/toplevel.h
- wx/mac/carbon/treectrl.h
- wx/mac/carbon/uma.h
- wx/mac/carbon/window.h
+
+
+ wx/osx/core/colour.h
+
+ wx/osx/carbon/chkconf.h
+ wx/osx/carbon/evtloop.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/region.h
+ wx/osx/carbon/statbmp.h
+ wx/osx/carbon/uma.h
wx/generic/caret.h
wx/generic/clrpickerg.h
@@ -2465,11 +2407,74 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/fontpickerg.h
wx/generic/listctrl.h
wx/generic/statusbr.h
- wx/generic/tabg.h
wx/html/webkit.h
+
+
+
+
+
+ $(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
+ 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
+
+
+ wx/osx/cocoa/chkconf.h
+ wx/osx/cocoa/evtloop.h
+ wx/osx/cocoa/private.h
+ $(OSX_CARBON_HDR)
+ wx/generic/region.h
+
+
+
+
+
+
+
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+
@@ -2477,8 +2482,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/mac/corefoundation/hid.cpp
- src/mac/corefoundation/utilsexc_cf.cpp
+ src/osx/core/hid.cpp
+ src/osx/core/utilsexc_cf.cpp
@@ -2574,7 +2579,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/paletteg.cpp
src/generic/regiong.cpp
src/generic/statusbr.cpp
- src/generic/tabg.cpp
wx/cocoa/NSApplication.h
@@ -2617,6 +2621,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2662,7 +2667,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/paletteg.h
wx/generic/region.h
wx/generic/statusbr.h
- wx/generic/tabg.h
@@ -2694,13 +2698,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
src/univ/checklst.cpp
src/univ/choice.cpp
- src/univ/colschem.cpp
src/univ/combobox.cpp
src/univ/control.cpp
src/univ/ctrlrend.cpp
@@ -2717,6 +2719,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/univ/scrarrow.cpp
src/univ/scrolbar.cpp
src/univ/scrthumb.cpp
+ src/univ/settingsuniv.cpp
src/univ/slider.cpp
src/univ/spinbutt.cpp
src/univ/statbmp.cpp
@@ -2747,7 +2750,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -2796,16 +2798,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/animatecmn.cpp
+ src/common/bmpcboxcmn.cpp
+ src/common/calctrlcmn.cpp
src/common/datavcmn.cpp
src/common/hyperlnkcmn.cpp
src/generic/aboutdlgg.cpp
src/generic/bmpcboxg.cpp
- src/generic/calctrl.cpp
+ src/generic/calctrlg.cpp
src/generic/datavgen.cpp
src/generic/datectlg.cpp
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
@@ -2831,11 +2836,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/editlbox.h
wx/generic/aboutdlgg.h
wx/generic/bmpcbox.h
- wx/generic/calctrl.h
+ wx/generic/calctrlg.h
wx/generic/datectrl.h
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
@@ -2877,9 +2883,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
+ src/msw/bmpcbox.cpp
+ src/msw/calctrl.cpp
+ src/msw/datecontrols.cpp
src/msw/datectrl.cpp
+ wx/msw/bmpcbox.h
+ wx/msw/calctrl.h
+ wx/msw/datecontrols.h
wx/msw/datectrl.h
@@ -2891,40 +2903,63 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/joystick.h
-
+
+ src/common/taskbarcmn.cpp
+ src/generic/animateg.cpp
+ src/osx/carbon/aboutdlg.cpp
+ src/osx/carbon/drawer.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
+
+
+
+ wx/generic/animate.h
+ wx/osx/dataview.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/core/joystick.h
+
+
+
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
- src/mac/carbon/aboutdlg.cpp
- src/mac/carbon/drawer.cpp
- src/mac/carbon/dataview.cpp
- src/mac/carbon/databrow.cpp
- src/mac/carbon/sound.cpp
- src/mac/carbon/taskbar.cpp
- src/mac/corefoundation/hidjoystick.cpp
-
-
+ src/osx/cocoa/aboutdlg.mm
+ src/osx/cocoa/taskbar.mm
+ src/osx/core/hidjoystick.cpp
+
+
+
wx/generic/animate.h
- wx/mac/dataview.h
- wx/mac/joystick.h
- wx/mac/sound.h
- wx/mac/carbon/drawer.h
- wx/mac/carbon/dataview.h
- wx/mac/carbon/databrow.h
- wx/mac/carbon/sound.h
- wx/mac/carbon/taskbarosx.h
- wx/mac/corefoundation/joystick.h
+ wx/osx/dataview.h
+ wx/osx/joystick.h
+ wx/osx/sound.h
+
+
+
+ wx/osx/carbon/sound.h
+ wx/osx/carbon/taskbarosx.h
+ wx/osx/core/joystick.h
src/cocoa/taskbar.mm
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
- src/mac/corefoundation/hidjoystick.cpp
+ src/osx/core/hidjoystick.cpp
+
wx/cocoa/taskbar.h
wx/generic/animate.h
- wx/mac/corefoundation/joystick.h
+ wx/osx/core/joystick.h
@@ -2970,11 +3005,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/aboutdlg.cpp
src/gtk/animate.cpp
+ src/gtk/bmpcbox.cpp
+ src/gtk/calctrl.cpp
src/gtk/dataview.cpp
src/gtk/hyperlink.cpp
wx/gtk/animate.h
+ wx/gtk/bmpcbox.h
+ wx/gtk/calctrl.h
wx/gtk/dataview.h
wx/gtk/hyperlink.h
@@ -3011,10 +3050,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/mediactrl_am.cpp
src/msw/mediactrl_wmp10.cpp
src/msw/mediactrl_qt.cpp
- src/msw/ole/activex.cpp
- wx/msw/ole/activex.h
@@ -3022,10 +3059,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
- src/mac/carbon/mediactrl.cpp
+
+ src/osx/carbon/mediactrl.cpp
-
+
+
+
+
+
+
+
@@ -3138,6 +3181,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3183,6 +3227,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xmlres.cpp
+ src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
@@ -3200,6 +3245,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
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
@@ -3268,8 +3314,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/common/glcmn.cpp
- src/mac/carbon/glcanvas.cpp
+ src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp
+ src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp
src/cocoa/glcanvas.mm
src/gtk/glcanvas.cpp
@@ -3292,7 +3338,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h
+ wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h
wx/cocoa/glcanvas.h
wx/gtk/glcanvas.h
@@ -3331,6 +3377,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/dockart.cpp
src/aui/floatpane.cpp
src/aui/auibook.cpp
+ src/aui/auibar.cpp
src/aui/tabmdi.cpp
@@ -3338,10 +3385,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/dockart.h
wx/aui/floatpane.h
wx/aui/auibook.h
+ wx/aui/auibar.h
wx/aui/tabmdi.h
wx/aui/aui.h
+
+
+
+
+
+ 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
+
+
+ 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
+
+
@@ -3392,34 +3466,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
- $(BASE_MACOSX_WXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
+
+ $(BASE_OSX_SHARED_SRC)
+ $(BASE_OSX_SHARED_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
- $(BASE_MACOSX_NOTWXMAC_SRC)
+ $(BASE_OSX_NOTWXMAC_SRC)
$(BASE_UNIX_SRC)
$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
- $(BASE_MACOSX_SRC)
- $(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)
+ $(BASE_OSX_SHARED_SRC)
$(BASE_OS2_SRC)
$(BASE_PALMOS_SRC)
$(BASE_MSDOS_SRC)
- $(BASE_AND_GUI_MAC_SRC)
+ $(BASE_AND_GUI_OSX_CARBON_SRC)
+ $(BASE_AND_GUI_OSX_COCOA_SRC)
- $(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_WIN32_SRC)
- $(BASE_AND_GUI_UNIX_SRC)
$(BASE_AND_GUI_PALMOS_SRC)
$(BASE_AND_GUI_MSDOS_SRC)
@@ -3428,22 +3501,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
- $(BASE_MACOSX_WXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
+
+ $(BASE_OSX_SHARED_HDR)
+ $(BASE_OSX_SHARED_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
- $(BASE_MACOSX_NOTWXMAC_HDR)
+ $(BASE_OSX_NOTWXMAC_HDR)
$(BASE_UNIX_HDR)
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
- $(BASE_MACOSX_HDR)
+ $(BASE_OSX_HDR)
$(BASE_PALMOS_HDR)
$(BASE_MSDOS_HDR)
$(BASE_OS2_HDR)
@@ -3462,16 +3536,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(NET_UNIX_SRC)
$(NET_WIN32_SRC) $(NET_WINCE_SRC)
- $(NET_UNIX_SRC)
- $(NET_MAC_CARBONLIB_SRC)
+ $(NET_UNIX_SRC) $(NET_OSX_SRC)
$(NET_OS2_SRC)
- $(NET_UNIX_HDR)
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
- $(NET_OS2_HDR)
- $(NET_UNIX_HDR)
- $(NET_MAC_CARBONLIB_HDR)
@@ -3487,7 +3556,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_LOWLEVEL_SRC)
$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)
$(MSW_LOWLEVEL_SRC)
- $(MAC_LOWLEVEL_SRC)
+ $(OSX_LOWLEVEL_SRC)
+ $(OSX_LOWLEVEL_SRC)
$(COCOA_LOWLEVEL_SRC)
$(OS2_LOWLEVEL_SRC)
$(X11_LOWLEVEL_SRC)
@@ -3500,7 +3570,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_LOWLEVEL_HDR)
$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)
$(MSW_LOWLEVEL_HDR)
- $(MAC_LOWLEVEL_HDR)
+ $(OSX_LOWLEVEL_HDR)
+ $(OSX_LOWLEVEL_HDR)
$(COCOA_LOWLEVEL_HDR)
$(OS2_LOWLEVEL_HDR)
$(X11_LOWLEVEL_HDR)
@@ -3508,13 +3579,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(DFB_LOWLEVEL_HDR)
+
+ $(UNIX_SRC)
+ $(UNIX_SRC)
+
+
$(GTK_SRC)
$(GTK1_SRC)
$(MOTIF_SRC)
$(MSW_SRC) $(MSW_DESKTOP_SRC)
$(MSW_SRC) $(WINCE_SRC)
- $(MAC_SRC) $(MAC_OSX_SRC)
+ $(OSX_CARBON_SRC)
+ $(OSX_COCOA_SRC)
$(COCOA_SRC)
$(OS2_SRC)
@@ -3524,17 +3601,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MOTIF_HDR)
$(MSW_HDR) $(MSW_DESKTOP_HDR)
$(MSW_HDR) $(WINCE_HDR)
- $(MAC_CMN_HDR) $(MAC_HDR)
+ $(OSX_SHARED_HDR) $(OSX_CARBON_HDR)
+ $(OSX_SHARED_HDR) $(OSX_COCOA_HDR)
$(COCOA_HDR)
$(OS2_HDR)
- $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
+ $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
- $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+ $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
@@ -3542,7 +3620,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)
$(ADVANCED_MSW_SRC)
- $(ADVANCED_MAC_SRC)
+ $(ADVANCED_OSX_CARBON_SRC)
+ $(ADVANCED_OSX_COCOA_SRC)
$(ADVANCED_COCOA_SRC)
$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)
$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)
@@ -3554,7 +3633,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)
$(ADVANCED_MSW_HDR)
- $(ADVANCED_MAC_HDR)
+ $(ADVANCED_OSX_CARBON_HDR)
+ $(ADVANCED_OSX_COCOA_HDR)
$(ADVANCED_COCOA_HDR)
$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)
$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)
@@ -3589,7 +3669,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)
$(MEDIA_MSW_SRC)
- $(MEDIA_MAC_SRC)
+ $(MEDIA_OSX_CARBON_SRC)
+ $(MEDIA_OSX_COCOA_SRC)
$(MEDIA_COCOA_SRC)
$(MEDIA_UNIX_SRC)
$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)
@@ -3599,7 +3680,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)
$(MEDIA_MSW_HDR)
- $(MEDIA_MAC_HDR)
+ $(MEDIA_OSX_CARBON_HDR)
$(MEDIA_COCOA_HDR)
$(MEDIA_UNIX_HDR)
$(MEDIA_UNIX_HDR)
@@ -3621,15 +3702,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(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)
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
- $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
+ $(NET_CMN_HDR)
$(XML_HDR)
@@ -3642,15 +3723,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(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)
- $(NET_MAC_CARBONLIB_HDR)
$(XML_HDR)
@@ -3658,15 +3734,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(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_UNIX_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)