ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxw3: update wx/setup.h for wxgtk to be compatible with current version

This commit is contained in:
Shawn Hoffman 2012-03-19 01:12:41 -07:00
parent 00fed2e70e
commit 20bb7a28b5
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Externals/wxWidgets3/wx/wxgtk.h vendored
View File

@ -213,10 +213,16 @@
#define wxUSE_STD_DEFAULT 0 #define wxUSE_STD_DEFAULT 0
#endif #endif
#define wxUSE_STD_CONTAINERS 0
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 1
#define wxUSE_STD_STRING 1 #define wxUSE_STD_STRING 1
#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
#define wxUSE_IOSTREAMH 0
#define wxUSE_PRINTF_POS_PARAMS 1 #define wxUSE_PRINTF_POS_PARAMS 1
@ -323,6 +329,19 @@
#define wxUSE_STC 0 #define wxUSE_STC 0
#define wxUSE_WEBVIEW 0
#ifdef __WXMSW__
#define wxUSE_WEBVIEW_IE 0
#else
#define wxUSE_WEBVIEW_IE 0
#endif
#if defined(__WXGTK__) || defined(__WXOSX__)
#define wxUSE_WEBVIEW_WEBKIT 0
#else
#define wxUSE_WEBVIEW_WEBKIT 0
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
@ -350,11 +369,14 @@
#define wxUSE_CONTROLS 1 #define wxUSE_CONTROLS 1
#define wxUSE_MARKUP 0
#define wxUSE_POPUPWIN 1 #define wxUSE_POPUPWIN 1
#define wxUSE_TIPWINDOW 1 #define wxUSE_TIPWINDOW 1
#define wxUSE_ANIMATIONCTRL 1 #define wxUSE_ANIMATIONCTRL 1
#define wxUSE_BANNERWINDOW 1
#define wxUSE_BUTTON 1 #define wxUSE_BUTTON 1
#define wxUSE_BMPBUTTON 1 #define wxUSE_BMPBUTTON 1
#define wxUSE_CALENDARCTRL 1 #define wxUSE_CALENDARCTRL 1
@ -390,8 +412,10 @@
#define wxUSE_STATTEXT 1 #define wxUSE_STATTEXT 1
#define wxUSE_STATBMP 1 #define wxUSE_STATBMP 1
#define wxUSE_TEXTCTRL 1 #define wxUSE_TEXTCTRL 1
#define wxUSE_TIMEPICKCTRL 1
#define wxUSE_TOGGLEBTN 1 #define wxUSE_TOGGLEBTN 1
#define wxUSE_TREECTRL 1 #define wxUSE_TREECTRL 1
#define wxUSE_TREELISTCTRL 1
#define wxUSE_STATUSBAR 1 #define wxUSE_STATUSBAR 1
@ -447,6 +471,8 @@
#define wxUSE_NOTIFICATION_MESSAGE 1 #define wxUSE_NOTIFICATION_MESSAGE 1
#define wxUSE_RICHTOOLTIP 1
#define wxUSE_SASH 1 #define wxUSE_SASH 1
#define wxUSE_SPLITTER 1 #define wxUSE_SPLITTER 1
@ -559,6 +585,7 @@
#define wxUSE_SVG 1 #define wxUSE_SVG 1
#define wxUSE_DC_TRANSFORM_MATRIX 1
#define REMOVE_UNUSED_ARG 0 #define REMOVE_UNUSED_ARG 0