diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript index 51bfaa3727..d7b510da62 100644 --- a/Externals/wxWidgets3/SConscript +++ b/Externals/wxWidgets3/SConscript @@ -28,7 +28,7 @@ aui = [ common = [ 'src/common/accelcmn.cpp', - 'src/common/accesscmn.cpp', + #'src/common/accesscmn.cpp', 'src/common/anidecod.cpp', 'src/common/animatecmn.cpp', 'src/common/any.cpp', @@ -85,12 +85,10 @@ common = [ 'src/common/docview.cpp', 'src/common/dpycmn.cpp', 'src/common/dseldlg.cpp', - 'src/common/dummy.cpp', 'src/common/dynarray.cpp', 'src/common/dynlib.cpp', 'src/common/dynload.cpp', - 'src/common/effects.cpp', - 'src/common/emptydmy.cpp', + #'src/common/effects.cpp', 'src/common/encconv.cpp', 'src/common/event.cpp', 'src/common/evtloopcmn.cpp', @@ -123,7 +121,7 @@ common = [ 'src/common/fs_filter.cpp', 'src/common/fs_inet.cpp', 'src/common/fs_mem.cpp', - 'src/common/fswatchercmn.cpp', + #'src/common/fswatchercmn.cpp', 'src/common/ftp.cpp', 'src/common/gaugecmn.cpp', 'src/common/gbsizer.cpp', @@ -147,12 +145,12 @@ common = [ 'src/common/imagfill.cpp', 'src/common/imaggif.cpp', 'src/common/imagiff.cpp', - 'src/common/imagjpeg.cpp', + #'src/common/imagjpeg.cpp', 'src/common/imagpcx.cpp', 'src/common/imagpng.cpp', 'src/common/imagpnm.cpp', 'src/common/imagtga.cpp', - 'src/common/imagtiff.cpp', + #'src/common/imagtiff.cpp', 'src/common/imagxpm.cpp', 'src/common/init.cpp', 'src/common/intl.cpp', @@ -166,7 +164,7 @@ common = [ 'src/common/longlong.cpp', 'src/common/matrix.cpp', #'src/common/mediactrlcmn.cpp', - 'src/common/memory.cpp', + #'src/common/memory.cpp', 'src/common/menucmn.cpp', 'src/common/mimecmn.cpp', 'src/common/module.cpp', @@ -178,7 +176,7 @@ common = [ 'src/common/object.cpp', 'src/common/odcombocmn.cpp', 'src/common/overlaycmn.cpp', - 'src/common/ownerdrwcmn.cpp', + #'src/common/ownerdrwcmn.cpp', 'src/common/panelcmn.cpp', 'src/common/paper.cpp', 'src/common/persist.cpp', @@ -193,7 +191,7 @@ common = [ 'src/common/radiobtncmn.cpp', 'src/common/radiocmn.cpp', 'src/common/rearrangectrl.cpp', - 'src/common/regex.cpp', + #'src/common/regex.cpp', 'src/common/rendcmn.cpp', 'src/common/rgncmn.cpp', 'src/common/sckaddr.cpp', @@ -260,9 +258,9 @@ common = [ 'src/common/wxprintf.cpp', 'src/common/xlocale.cpp', 'src/common/xpmdecod.cpp', - 'src/common/xti.cpp', - 'src/common/xtistrm.cpp', - 'src/common/xtixml.cpp', + #'src/common/xti.cpp', + #'src/common/xtistrm.cpp', + #'src/common/xtixml.cpp', 'src/common/zipstrm.cpp', 'src/common/zstream.cpp', ] @@ -307,7 +305,7 @@ generic = [ 'src/generic/filectrlg.cpp', 'src/generic/filepickerg.cpp', 'src/generic/fontdlgg.cpp', - 'src/generic/fswatcherg.cpp', + #'src/generic/fswatcherg.cpp', 'src/generic/graphicc.cpp', 'src/generic/grid.cpp', 'src/generic/gridctrl.cpp', @@ -315,14 +313,14 @@ generic = [ 'src/generic/gridsel.cpp', 'src/generic/headerctrlg.cpp', 'src/generic/helpext.cpp', - 'src/generic/htmllbox.cpp', + #'src/generic/htmllbox.cpp', 'src/generic/hyperlinkg.cpp', 'src/generic/infobar.cpp', 'src/generic/laywin.cpp', 'src/generic/listbkg.cpp', 'src/generic/listctrl.cpp', 'src/generic/logg.cpp', - 'src/generic/mask.cpp', + #'src/generic/mask.cpp', 'src/generic/mdig.cpp', 'src/generic/msgdlgg.cpp', #'src/generic/notebook.cpp', @@ -422,9 +420,9 @@ gtk = [ 'src/gtk/frame.cpp', 'src/gtk/gauge.cpp', 'src/gtk/glcanvas.cpp', - 'src/gtk/gnome/gprint.cpp', - 'src/gtk/gnome/gvfs.cpp', - 'src/gtk/hildon/notifmsg.cpp', + #'src/gtk/gnome/gprint.cpp', + #'src/gtk/gnome/gvfs.cpp', + #'src/gtk/hildon/notifmsg.cpp', 'src/gtk/hyperlink.cpp', 'src/gtk/infobar.cpp', 'src/gtk/listbox.cpp', @@ -600,7 +598,7 @@ msw = [ 'src/msw/fontenum.cpp', 'src/msw/fontutil.cpp', 'src/msw/frame.cpp', - 'src/msw/fswatcher.cpp', + #'src/msw/fswatcher.cpp', 'src/msw/gauge.cpp', 'src/msw/gdiimage.cpp', 'src/msw/gdiobj.cpp', @@ -615,7 +613,7 @@ msw = [ 'src/msw/icon.cpp', 'src/msw/imaglist.cpp', 'src/msw/iniconf.cpp', - 'src/msw/joystick.cpp', + #'src/msw/joystick.cpp', 'src/msw/listbox.cpp', 'src/msw/listctrl.cpp', 'src/msw/main.cpp', @@ -667,7 +665,7 @@ msw = [ 'src/msw/sound.cpp', 'src/msw/spinbutt.cpp', 'src/msw/spinctrl.cpp', - 'src/msw/stackwalk.cpp', + #'src/msw/stackwalk.cpp', 'src/msw/statbmp.cpp', 'src/msw/statbox.cpp', 'src/msw/statline.cpp', @@ -761,7 +759,7 @@ osx = [ 'src/osx/carbon/clipbrd.cpp', #'src/osx/carbon/colordlg.cpp', 'src/osx/carbon/colordlgosx.mm', - 'src/osx/carbon/combobox.cpp', + #'src/osx/carbon/combobox.cpp', #'src/osx/carbon/combobxc.cpp', 'src/osx/carbon/control.cpp', 'src/osx/carbon/cursor.cpp', @@ -800,7 +798,7 @@ osx = [ #'src/osx/carbon/msgdlg.cpp', #'src/osx/carbon/nonownedwnd.cpp', #'src/osx/carbon/notebmac.cpp', - 'src/osx/carbon/overlay.cpp', + #'src/osx/carbon/overlay.cpp', 'src/osx/carbon/popupwin.cpp', #'src/osx/carbon/printdlg.cpp', #'src/osx/carbon/radiobut.cpp', @@ -809,7 +807,7 @@ osx = [ #'src/osx/carbon/scrolbar.cpp', 'src/osx/carbon/settings.cpp', #'src/osx/carbon/slider.cpp', - 'src/osx/carbon/sound.cpp', + #'src/osx/carbon/sound.cpp', #'src/osx/carbon/spinbutt.cpp', #'src/osx/carbon/srchctrl.cpp', #'src/osx/carbon/statbmp.cpp', @@ -875,7 +873,7 @@ osx = [ 'src/osx/core/fontenum.cpp', 'src/osx/core/glgrab.cpp', 'src/osx/core/hid.cpp', - 'src/osx/core/hidjoystick.cpp', + #'src/osx/core/hidjoystick.cpp', 'src/osx/core/mimetype.cpp', 'src/osx/core/printmac.cpp', 'src/osx/core/sockosx.cpp', @@ -1129,14 +1127,14 @@ unix = [ 'src/unix/appunix.cpp', 'src/unix/dir.cpp', 'src/unix/dlunix.cpp', - 'src/unix/epolldispatcher.cpp', + #'src/unix/epolldispatcher.cpp', 'src/unix/evtloopunix.cpp', 'src/unix/fdiounix.cpp', - 'src/unix/fswatcher_kqueue.cpp', + #'src/unix/fswatcher_kqueue.cpp', #'src/unix/net.cpp', 'src/unix/snglinst.cpp', 'src/unix/sockunix.cpp', - 'src/unix/stackwalk.cpp', + #'src/unix/stackwalk.cpp', 'src/unix/stdpaths.cpp', 'src/unix/threadpsx.cpp', 'src/unix/timerunx.cpp', @@ -1148,14 +1146,14 @@ unixgtk = [ 'src/unix/displayx11.cpp', 'src/unix/fontenum.cpp', 'src/unix/fontutil.cpp', - 'src/unix/fswatcher_inotify.cpp', + #'src/unix/fswatcher_inotify.cpp', 'src/unix/glx11.cpp', - 'src/unix/joystick.cpp', + #'src/unix/joystick.cpp', #'src/unix/mediactrl.cpp', 'src/unix/mimetype.cpp', 'src/unix/sound.cpp', - 'src/unix/sound_sdl.cpp', - 'src/unix/taskbarx11.cpp', + #'src/unix/sound_sdl.cpp', + #'src/unix/taskbarx11.cpp', 'src/unix/uiactionx11.cpp', 'src/unix/utilsx11.cpp', ] diff --git a/Externals/wxWidgets3/wx/wxgtk.h b/Externals/wxWidgets3/wx/wxgtk.h index f20e4072d1..42988ec8b1 100644 --- a/Externals/wxWidgets3/wx/wxgtk.h +++ b/Externals/wxWidgets3/wx/wxgtk.h @@ -1004,14 +1004,11 @@ /* The number of bytes in a short. */ #define SIZEOF_SHORT 2 -/* The number of bytes in a size_t. */ -#define SIZEOF_SIZE_T 4 - -/* Define if size_t on your machine is the same type as unsigned int. */ +#ifdef __LP64__ +#define wxSIZE_T_IS_ULONG 1 +#else #define wxSIZE_T_IS_UINT 1 - -/* Define if size_t on your machine is the same type as unsigned long. */ -/* #undef wxSIZE_T_IS_ULONG */ +#endif /* Define if wchar_t is distinct type in your compiler. */ #define wxWCHAR_T_IS_REAL_TYPE 1