src/common/filesys.cpp
src/common/fmapbase.cpp
src/common/fs_zip.cpp
+ src/common/gzstream.cpp
src/common/hash.cpp
src/common/hashmap.cpp
src/common/init.cpp
wx/debug.h
wx/defs.h
wx/dir.h
+ wx/dlimpexp.h
wx/dynarray.h
wx/dynlib.h
wx/dynload.h
wx/fontmap.h
wx/fs_mem.h
wx/fs_zip.h
+ wx/gzstream.h
wx/hash.h
wx/hashmap.h
wx/hashset.h
wx/regex.h
wx/scopeguard.h
wx/snglinst.h
+ wx/stack.h
wx/stopwatch.h
wx/strconv.h
wx/stream.h
wx/unix/gsockunx.h
</set>
-<set var="NET_MAC_SRC" hints="files">
- src/mac/gsocket.c
-</set>
-<set var="NET_MAC_HDR" hints="files">
- wx/mac/gsockmac.h
-</set>
-
<set var="NET_OS2_SRC" hints="files">
src/os2/gsocket.c
</set>
src/common/fontmap.cpp
src/common/framecmn.cpp
src/common/gaugecmn.cpp
+ src/common/gbsizer.cpp
src/common/gdicmn.cpp
src/common/geometry.cpp
src/common/gifdecod.cpp
wx/filedlg.h
wx/frame.h
wx/gauge.h
+ wx/gbsizer.h
wx/gdicmn.h
wx/generic/accel.h
wx/generic/choicdgg.h
wx/spinbutt.h
wx/spinctrl.h
wx/splitter.h
- wx/stack.h
wx/statline.h
wx/tab.h
wx/tabctrl.h
wx/treebase.h
wx/treectrl.h
wx/valgen.h
+ wx/vidmode.h
wx/vlbox.h
wx/vms_x_fix.h
wx/vscroll.h
src/unix/fontenum.cpp
src/unix/fontutil.cpp
src/unix/utilsx11.cpp
+ src/unix/displayx11.cpp
</set>
<set var="XWIN_LOWLEVEL_HDR" hints="files">
wx/generic/caret.h
wx/unix/fontutil.h
wx/unix/utilsx11.h
+ wx/unix/displayx11.h
</set>
src/gtk/gsockgtk.c
src/gtk/icon.cpp
src/gtk/main.cpp
+ src/gtk/minifram.cpp
src/gtk/pen.cpp
src/gtk/popupwin.cpp
src/gtk/region.cpp
src/gtk/listbox.cpp
src/gtk/mdi.cpp
src/gtk/menu.cpp
- src/gtk/minifram.cpp
src/gtk/msgdlg.cpp
src/gtk/notebook.cpp
src/gtk/radiobox.cpp
src/motif/minifram.cpp
src/motif/msgdlg.cpp
src/motif/palette.cpp
+ src/motif/popupwin.cpp
src/motif/radiobox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
wx/motif/minifram.h
wx/motif/msgdlg.h
wx/motif/palette.h
+ wx/motif/popupwin.h
wx/motif/print.h
wx/motif/private.h
wx/motif/radiobox.h
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
src/generic/imaglist.cpp
+ src/generic/listctrl.cpp
src/generic/mdig.cpp
src/generic/msgdlgg.cpp
src/generic/prntdlgg.cpp
src/os2/dcscreen.cpp
src/os2/dialog.cpp
src/os2/dnd.cpp
+ src/os2/evtloop.cpp
src/os2/filedlg.cpp
src/os2/font.cpp
src/os2/fontdlg.cpp
src/os2/icon.cpp
src/os2/iniconf.cpp
src/os2/listbox.cpp
- src/os2/listctrl.cpp
src/os2/main.cpp
src/os2/menu.cpp
src/os2/menuitem.cpp
src/os2/toolbar.cpp
src/os2/tooltip.cpp
src/os2/toplevel.cpp
- src/os2/treectrl.cpp
src/os2/utilsgui.cpp
src/os2/window.cpp
</set>
wx/generic/colrdlgg.h
wx/generic/dirdlgg.h
wx/generic/fdrepdlg.h
+ wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/statusbr.h
wx/os2/accel.h
wx/os2/icon.h
wx/os2/iniconf.h
wx/os2/listbox.h
- wx/os2/listctrl.h
wx/os2/menu.h
wx/os2/menuitem.h
wx/os2/metafile.h
wx/os2/toolbar.h
wx/os2/tooltip.h
wx/os2/toplevel.h
- wx/msw/treectrl.h
wx/os2/window.h
</set>
src/mac/frame.cpp
src/mac/gauge.cpp
src/mac/gdiobj.cpp
+ src/mac/gsockosx.c
src/mac/icon.cpp
src/mac/listbox.cpp
src/mac/mdi.cpp
src/cocoa/dcmemory.mm
src/cocoa/dcscreen.cpp
src/cocoa/dialog.mm
+ src/cocoa/evtloop.mm
src/cocoa/font.cpp
src/cocoa/fontenum.mm
src/cocoa/fontutil.cpp
src/cocoa/listbox.mm
src/cocoa/main.cpp
src/cocoa/mbarman.mm
+ src/cocoa/mdi.mm
src/cocoa/menu.mm
src/cocoa/menuitem.mm
src/cocoa/pen.mm
src/cocoa/statline2.mm
src/cocoa/stattext.mm
src/cocoa/textctrl.mm
+ src/cocoa/toolbar.mm
src/cocoa/toplevel.mm
src/cocoa/utils.cpp
src/cocoa/utilsexc.cpp
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
- src/generic/mdig.cpp
src/generic/msgdlgg.cpp
src/generic/notebook.cpp
src/generic/paletteg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/timer.cpp
+ <!-- wxMac stuff used by wxCocoa: -->
+ src/mac/gsockosx.c
</set>
<set var="COCOA_HDR" hints="files">
wx/cocoa/NSBox.h
wx/cocoa/icon.h
wx/cocoa/listbox.h
wx/cocoa/mbarman.h
+ wx/cocoa/mdi.h
wx/cocoa/menu.h
wx/cocoa/menuitem.h
wx/cocoa/pen.h
wx/cocoa/statline.h
wx/cocoa/stattext.h
wx/cocoa/textctrl.h
+ wx/cocoa/toolbar.h
wx/cocoa/toplevel.h
wx/cocoa/window.h
<!-- Generic implementations used by wxCocoa: -->
wx/generic/fontdlgg.h
wx/generic/imaglist.h
wx/generic/listctrl.h
- wx/generic/mdig.h
wx/generic/paletteg.h
wx/generic/statusbr.h
wx/generic/tabg.h
<if cond="TOOLKIT=='MSW'">
src/msw/helpbest.cpp
</if>
+ <if cond="PLATFORM_UNIX=='1'">
+ src/html/chm.cpp
+ </if>
+ <if cond="PLATFORM_MACOSX=='1'">
+ src/html/chm.cpp
+ </if>
</set>
<set var="HTML_SRC" hints="files">
$(HTML_SRC_PLATFORM)
<if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
- <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+ <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
<if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
</set>
<if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
<if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
- <if cond="TOOLKIT=='MOTIF'">wx/motif/glcanvas.h</if>
+ <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
<if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
</set>
<!-- wxNet files: -->
- <set var="NET_MACOSX_SRC" hints="files">
- <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
- <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
- <if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
- <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
- </set>
<set var="NET_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
- <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_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)</if>
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
- <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
- <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+ <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
</set>
<set var="NET_SRC" hints="files">
$(BASE_AND_GUI_MAC_SRC)
$(BASE_AND_GUI_DARWIN_SRC)
$(BASE_AND_GUI_WIN32_SRC)
- $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
+ $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC)
$(XML_SRC) $(ODBC_SRC)
</set>