piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update wxWidgets to 3.1.0

Browse Source 
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7.

include/wx/defs.h -- __w64 warning disable patch by comex brought forward.

include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code.

src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux.

src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue.

src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text).

Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
This commit is contained in:
EmptyChaos
2016-06-26 05:25:29 +00:00
parent 3a26167148
commit 822326eea9
1748 changed files with 58822 additions and 84433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
# gtk, msw, osx and shared files as of r75363
# gtk, msw, osx and shared files as of 81570ae070b35c9d52de47b1f14897f3ff1a66c7
set(SRCS_AUI
"src/aui/auibar.cpp"
@ -12,6 +12,7 @@ set(SRCS_AUI
set(SRCS_COMMON
"src/common/accelcmn.cpp"
#"src/common/accesscmn.cpp"
"src/common/addremovectrl.cpp"
"src/common/affinematrix2d.cpp"
"src/common/anidecod.cpp"
"src/common/animatecmn.cpp"
@ -158,6 +159,7 @@ set(SRCS_COMMON
"src/common/msgout.cpp"
"src/common/mstream.cpp"
"src/common/nbkbase.cpp"
"src/common/notifmsgcmn.cpp"
"src/common/numformatter.cpp"
"src/common/object.cpp"
"src/common/odcombocmn.cpp"
@ -266,6 +268,7 @@ set(SRCS_GENERIC
"src/generic/caret.cpp"
"src/generic/choicbkg.cpp"
"src/generic/choicdgg.cpp"
"src/generic/collheaderctrlg.cpp"
#"src/generic/colour.cpp"
"src/generic/combog.cpp"
"src/generic/commandlinkbuttong.cpp"
@ -338,11 +341,15 @@ set(SRCS_GENERIC
set(SRCS_GENERICGTK
"src/generic/accel.cpp"
"src/generic/activityindicator.cpp"
"src/generic/icon.cpp"
"src/generic/imaglist.cpp"
"src/generic/paletteg.cpp"
"src/generic/preferencesg.cpp")
set(SRCS_GENERICMSW
"src/generic/activityindicator.cpp")
set(SRCS_GENERICOSX
"src/generic/animateg.cpp"
"src/generic/clrpickerg.cpp"
@ -355,6 +362,7 @@ set(SRCS_GENERICOSX
set(SRCS_GTK
"src/aui/tabartgtk.cpp"
"src/gtk/aboutdlg.cpp"
"src/gtk/activityindicator.cpp"
"src/gtk/animate.cpp"
"src/gtk/anybutton.cpp"
"src/gtk/app.cpp"
@ -385,6 +393,7 @@ set(SRCS_GTK
"src/gtk/dcscreen.cpp"
"src/gtk/dialog.cpp"
"src/gtk/dirdlg.cpp"
"src/gtk/display.cpp"
"src/gtk/dnd.cpp"
"src/gtk/eggtrayicon.c"
"src/gtk/evtloop.cpp"
@ -398,9 +407,7 @@ set(SRCS_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/hyperlink.cpp"
"src/gtk/infobar.cpp"
"src/gtk/listbox.cpp"
@ -448,10 +455,13 @@ set(SRCS_GTK
"src/gtk/window.cpp")
set(SRCS_MSW
"src/aui/barartmsw.cpp"
"src/aui/tabartmsw.cpp"
"src/msw/aboutdlg.cpp"
"src/msw/accel.cpp"
"src/msw/anybutton.cpp"
"src/msw/app.cpp"
"src/msw/appprogress.cpp"
"src/msw/artmsw.cpp"
"src/msw/basemsw.cpp"
"src/msw/bitmap.cpp"
@ -471,28 +481,28 @@ set(SRCS_MSW
"src/msw/combobox.cpp"
"src/msw/commandlinkbutton.cpp"
"src/msw/control.cpp"
"src/msw/crashrpt.cpp"
#"src/msw/crashrpt.cpp"
"src/msw/cursor.cpp"
"src/msw/data.cpp"
#"src/msw/data.cpp"
"src/msw/datecontrols.cpp"
"src/msw/datectrl.cpp"
"src/msw/datetimectrl.cpp"
"src/msw/dc.cpp"
"src/msw/dcclient.cpp"
"src/msw/dcmemory.cpp"
"src/msw/dcprint.cpp"
#"src/msw/dcprint.cpp"
"src/msw/dcscreen.cpp"
"src/msw/dde.cpp"
"src/msw/debughlp.cpp"
"src/msw/dialog.cpp"
"src/msw/dialup.cpp"
#"src/msw/dialup.cpp"
"src/msw/dib.cpp"
"src/msw/dir.cpp"
"src/msw/dirdlg.cpp"
"src/msw/display.cpp"
"src/msw/dlmsw.cpp"
"src/msw/dragimag.cpp"
"src/msw/enhmeta.cpp"
#"src/msw/enhmeta.cpp"
"src/msw/evtloop.cpp"
#"src/msw/evtloopconsole.cpp"
"src/msw/fdrepdlg.cpp"
@ -505,18 +515,19 @@ set(SRCS_MSW
#"src/msw/fswatcher.cpp"
"src/msw/gauge.cpp"
"src/msw/gdiimage.cpp"
"src/msw/gdiobj.cpp"
#"src/msw/gdiobj.cpp"
"src/msw/gdiplus.cpp"
"src/msw/glcanvas.cpp"
#"src/msw/glcanvas.cpp"
"src/msw/graphics.cpp"
#"src/msw/graphicsd2d.cpp"
"src/msw/headerctrl.cpp"
"src/msw/helpbest.cpp"
"src/msw/helpchm.cpp"
#"src/msw/helpbest.cpp"
#"src/msw/helpchm.cpp"
"src/msw/helpwin.cpp"
"src/msw/hyperlink.cpp"
"src/msw/icon.cpp"
"src/msw/imaglist.cpp"
"src/msw/iniconf.cpp"
#"src/msw/iniconf.cpp"
#"src/msw/joystick.cpp"
"src/msw/listbox.cpp"
"src/msw/listctrl.cpp"
@ -527,12 +538,10 @@ set(SRCS_MSW
#"src/msw/mediactrl_wmp10.cpp"
"src/msw/menu.cpp"
"src/msw/menuitem.cpp"
"src/msw/metafile.cpp"
"src/msw/microwin.c"
#"src/msw/metafile.cpp"
"src/msw/mimetype.cpp"
"src/msw/minifram.cpp"
"src/msw/msgdlg.cpp"
"src/msw/mslu.cpp"
"src/msw/nativdlg.cpp"
"src/msw/nativewin.cpp"
"src/msw/nonownedwnd.cpp"
@ -551,11 +560,10 @@ set(SRCS_MSW
"src/msw/palette.cpp"
"src/msw/panel.cpp"
"src/msw/pen.cpp"
"src/msw/penwin.cpp"
"src/msw/popupwin.cpp"
"src/msw/power.cpp"
"src/msw/printdlg.cpp"
"src/msw/printwin.cpp"
#"src/msw/printdlg.cpp"
#"src/msw/printwin.cpp"
"src/msw/progdlg.cpp"
"src/msw/radiobox.cpp"
"src/msw/radiobut.cpp"
@ -579,7 +587,9 @@ set(SRCS_MSW
"src/msw/stattext.cpp"
"src/msw/statusbar.cpp"
"src/msw/stdpaths.cpp"
"src/msw/systhemectrl.cpp"
"src/msw/taskbar.cpp"
"src/msw/taskbarbutton.cpp"
"src/msw/textctrl.cpp"
"src/msw/textentry.cpp"
"src/msw/textmeasure.cpp"
@ -592,7 +602,7 @@ set(SRCS_MSW
"src/msw/toplevel.cpp"
"src/msw/treectrl.cpp"
"src/msw/uiaction.cpp"
"src/msw/urlmsw.cpp"
#"src/msw/urlmsw.cpp"
"src/msw/utils.cpp"
"src/msw/utilsexc.cpp"
"src/msw/utilsgui.cpp"
@ -601,19 +611,11 @@ set(SRCS_MSW
"src/msw/version.rc"
"src/msw/volume.cpp"
#"src/msw/webview_ie.cpp"
"src/msw/wince/checklst.cpp"
"src/msw/wince/choicece.cpp"
"src/msw/wince/crt.cpp"
"src/msw/wince/filedlgwce.cpp"
"src/msw/wince/filefnwce.cpp"
"src/msw/wince/helpwce.cpp"
"src/msw/wince/menuce.cpp"
"src/msw/wince/net.cpp"
"src/msw/wince/tbarwce.cpp"
"src/msw/wince/textctrlce.cpp"
"src/msw/wince/time.cpp"
"src/msw/window.cpp"
"src/msw/winestub.c")
"src/msw/winestub.c"
#"src/msw/rt/notifmsgrt.cpp"
#"src/msw/rt/utilsrt.cpp"
)
set(SRCS_OSX
"src/osx/accel.cpp"
@ -632,8 +634,9 @@ set(SRCS_OSX
"src/osx/dialog_osx.cpp"
"src/osx/dnd_osx.cpp"
"src/osx/fontutil.cpp"
#"src/osx/fswatcher_fsevents.cpp"
"src/osx/gauge_osx.cpp"
"src/osx/glcanvas_osx.cpp"
#"src/osx/glcanvas_osx.cpp"
"src/osx/imaglist.cpp"
"src/osx/listbox_osx.cpp"
"src/osx/menu_osx.cpp"
@ -664,86 +667,39 @@ set(SRCS_OSX
"src/osx/utils_osx.cpp"
#"src/osx/webview_webkit.mm"
"src/osx/window_osx.cpp"
#"src/osx/carbon/aboutdlg.cpp"
"src/osx/carbon/anybutton.cpp"
"src/osx/carbon/app.cpp"
#"src/osx/carbon/bmpbuttn.cpp"
#"src/osx/carbon/button.cpp"
#"src/osx/carbon/checkbox.cpp"
#"src/osx/carbon/choice.cpp"
"src/osx/carbon/clipbrd.cpp"
#"src/osx/carbon/colordlg.cpp"
"src/osx/carbon/colordlgosx.mm"
#"src/osx/carbon/combobox.cpp"
#"src/osx/carbon/combobxc.cpp"
"src/osx/carbon/control.cpp"
"src/osx/carbon/cursor.cpp"
"src/osx/carbon/dataobj.cpp"
#"src/osx/carbon/dataview.cpp"
"src/osx/carbon/dcclient.cpp"
"src/osx/carbon/dcprint.cpp"
"src/osx/carbon/dcscreen.cpp"
#"src/osx/carbon/dialog.cpp"
#"src/osx/carbon/dirdlg.cpp"
#"src/osx/carbon/dirmac.cpp"
#"src/osx/carbon/dnd.cpp"
#"src/osx/carbon/drawer.cpp"
#"src/osx/carbon/evtloop.cpp"
#"src/osx/carbon/filedlg.cpp"
"src/osx/carbon/font.cpp"
"src/osx/carbon/fontdlg.cpp"
"src/osx/carbon/fontdlgosx.mm"
"src/osx/carbon/frame.cpp"
#"src/osx/carbon/gauge.cpp"
"src/osx/carbon/gdiobj.cpp"
#"src/osx/carbon/glcanvas.cpp"
"src/osx/carbon/graphics.cpp"
#"src/osx/carbon/helpxxxx.cpp"
"src/osx/carbon/icon.cpp"
#"src/osx/carbon/joystick.cpp"
#"src/osx/carbon/listbox.cpp"
#"src/osx/carbon/listctrl_mac.cpp"
#"src/osx/carbon/main.cpp"
"src/osx/carbon/mdi.cpp"
#"src/osx/carbon/mediactrl.cpp"
#"src/osx/carbon/menu.cpp"
#"src/osx/carbon/menuitem.cpp"
"src/osx/carbon/metafile.cpp"
#"src/osx/carbon/mimetmac.cpp"
#"src/osx/carbon/msgdlg.cpp"
#"src/osx/carbon/nonownedwnd.cpp"
#"src/osx/carbon/notebmac.cpp"
#"src/osx/carbon/overlay.cpp"
"src/osx/carbon/popupwin.cpp"
#"src/osx/carbon/printdlg.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/sound.cpp"
#"src/osx/carbon/spinbutt.cpp"
#"src/osx/carbon/srchctrl.cpp"
#"src/osx/carbon/statbmp.cpp"
#"src/osx/carbon/statbox.cpp"
"src/osx/carbon/statbrma.cpp"
#"src/osx/carbon/statline.cpp"
#"src/osx/carbon/statlmac.cpp"
#"src/osx/carbon/stattext.cpp"
#"src/osx/carbon/taskbar.cpp"
#"src/osx/carbon/textctrl.cpp"
#"src/osx/carbon/tglbtn.cpp"
#"src/osx/carbon/thread.cpp"
#"src/osx/carbon/timer.cpp"
#"src/osx/carbon/toolbar.cpp"
#"src/osx/carbon/tooltip.cpp"
#"src/osx/carbon/uma.cpp"
#"src/osx/carbon/utils.cpp"
"src/osx/carbon/utilscocoa.mm"
#"src/osx/carbon/window.cpp"
"src/osx/cocoa/aboutdlg.mm"
"src/osx/cocoa/activityindicator.mm"
"src/osx/cocoa/anybutton.mm"
"src/osx/cocoa/appprogress.mm"
"src/osx/cocoa/button.mm"
"src/osx/cocoa/checkbox.mm"
"src/osx/cocoa/choice.mm"
@ -763,24 +719,30 @@ set(SRCS_OSX
"src/osx/cocoa/menu.mm"
"src/osx/cocoa/menuitem.mm"
"src/osx/cocoa/msgdlg.mm"
"src/osx/cocoa/nativewin.mm"
"src/osx/cocoa/nonownedwnd.mm"
"src/osx/cocoa/notebook.mm"
"src/osx/cocoa/notifmsg.mm"
"src/osx/cocoa/overlay.mm"
"src/osx/cocoa/power.mm"
"src/osx/cocoa/printdlg.mm"
"src/osx/cocoa/radiobut.mm"
"src/osx/cocoa/scrolbar.mm"
"src/osx/cocoa/settings.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/stdpaths.mm"
"src/osx/cocoa/taskbar.mm"
"src/osx/cocoa/textctrl.mm"
"src/osx/cocoa/tglbtn.mm"
"src/osx/cocoa/toolbar.mm"
"src/osx/cocoa/tooltip.mm"
"src/osx/cocoa/utils.mm"
"src/osx/cocoa/utils_base.mm"
"src/osx/cocoa/window.mm"
"src/osx/core/bitmap.cpp"
"src/osx/core/cfstring.cpp"
@ -789,14 +751,12 @@ set(SRCS_OSX
"src/osx/core/display.cpp"
"src/osx/core/evtloop_cf.cpp"
"src/osx/core/fontenum.cpp"
"src/osx/core/glgrab.cpp"
"src/osx/core/hid.cpp"
#"src/osx/core/hidjoystick.cpp"
"src/osx/core/mimetype.cpp"
"src/osx/core/printmac.cpp"
"src/osx/core/sockosx.cpp"
"src/osx/core/sound.cpp"
"src/osx/core/stdpaths_cf.cpp"
"src/osx/core/strconv_cf.cpp"
"src/osx/core/timer.cpp"
"src/osx/core/utilsexc_base.cpp"
@ -810,6 +770,7 @@ set(SRCS_OSX
#"src/osx/iphone/msgdlg.mm"
#"src/osx/iphone/nonownedwnd.mm"
#"src/osx/iphone/scrolbar.mm"
#"src/osx/iphone/settings.mm"
#"src/osx/iphone/slider.mm"
#"src/osx/iphone/stattext.mm"
#"src/osx/iphone/textctrl.mm"
@ -831,7 +792,6 @@ set(SRCS_UNIX
"src/unix/snglinst.cpp"
"src/unix/sockunix.cpp"
"src/unix/stackwalk.cpp"
"src/unix/stdpaths.cpp"
"src/unix/threadpsx.cpp"
"src/unix/timerunx.cpp"
"src/unix/utilsunx.cpp"
@ -843,12 +803,14 @@ set(SRCS_UNIXGTK
"src/unix/fontenum.cpp"
"src/unix/fontutil.cpp"
#"src/unix/fswatcher_inotify.cpp"
"src/unix/glx11.cpp"
#"src/unix/glx11.cpp"
#"src/unix/joystick.cpp"
#"src/unix/mediactrl.cpp"
#"src/unix/mediactrl_gstplayer.cpp"
"src/unix/mimetype.cpp"
"src/unix/sound.cpp"
#"src/unix/sound_sdl.cpp"
"src/unix/stdpaths.cpp"
#"src/unix/taskbarx11.cpp"
"src/unix/uiactionx11.cpp"
"src/unix/utilsx11.cpp")
@ -882,8 +844,13 @@ if(APPLE)
${IOK_LIBRARY}
${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY})
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
add_definitions(-D__LINUX__=1)
else()
add_definitions(-D__BSD__=1)
endif()
add_definitions(-D__WXGTK__)
set(SRCS
${SRCS}
@ -891,15 +858,23 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
${SRCS_GTK}
${SRCS_UNIX}
${SRCS_UNIXGTK})
if (NOT X11_xf86vmode_FOUND OR NOT X11_Xinerama_FOUND)
message(FATAL_ERROR "wxGTK2 needs Xinerama and Xxf86vm")
endif()
set(LIBS
png
${GTHREAD2_LIBRARIES}
${PANGOCAIRO_LIBRARIES}
${GTK2_LIBRARIES})
${GTK2_LIBRARIES}
${Backtrace_LIBRARY}
${X11_X11_LIB}
${X11_Xxf86vm_LIB}
${X11_Xinerama_LIB})
else()
add_definitions(-D__WXMSW__)
set(SRCS
${SRCS}
${SRCS_GENERICMSW}
${SRCS_MSW})
endif()