iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Update wxWidgets to 3.1.0

This commit is contained in:
Thomas Goyne 2016-03-06 14:38:34 -08:00
parent 26fea0e123
commit e3ad5ea976
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/scintilla/scintilla.vcxproj
View File

@ -74,10 +74,13 @@
<ClCompile Include="$(SrcDir)\src\ContractionState.cxx" /> <ClCompile Include="$(SrcDir)\src\ContractionState.cxx" />
<ClCompile Include="$(SrcDir)\src\Decoration.cxx" /> <ClCompile Include="$(SrcDir)\src\Decoration.cxx" />
<ClCompile Include="$(SrcDir)\src\Document.cxx" /> <ClCompile Include="$(SrcDir)\src\Document.cxx" />
<ClCompile Include="$(SrcDir)\src\EditModel.cxx" />
<ClCompile Include="$(SrcDir)\src\EditView.cxx" />
<ClCompile Include="$(SrcDir)\src\Editor.cxx" /> <ClCompile Include="$(SrcDir)\src\Editor.cxx" />
<ClCompile Include="$(SrcDir)\src\Indicator.cxx" /> <ClCompile Include="$(SrcDir)\src\Indicator.cxx" />
<ClCompile Include="$(SrcDir)\src\KeyMap.cxx" /> <ClCompile Include="$(SrcDir)\src\KeyMap.cxx" />
<ClCompile Include="$(SrcDir)\src\LineMarker.cxx" /> <ClCompile Include="$(SrcDir)\src\LineMarker.cxx" />
<ClCompile Include="$(SrcDir)\src\MarginView.cxx" />
<ClCompile Include="$(SrcDir)\src\PerLine.cxx" /> <ClCompile Include="$(SrcDir)\src\PerLine.cxx" />
<ClCompile Include="$(SrcDir)\src\PositionCache.cxx" /> <ClCompile Include="$(SrcDir)\src\PositionCache.cxx" />
<ClCompile Include="$(SrcDir)\src\RESearch.cxx" /> <ClCompile Include="$(SrcDir)\src\RESearch.cxx" />

3
build/wx/setup-build.h
View File

@ -98,7 +98,7 @@
#define wxUSE_CHECKBOX 1 #define wxUSE_CHECKBOX 1
#define wxUSE_CHECKLISTBOX 1 #define wxUSE_CHECKLISTBOX 1
#define wxUSE_CHOICE 1 #define wxUSE_CHOICE 1
#define wxUSE_COLLPANE 1 #define wxUSE_COLLPANE 0
#define wxUSE_COLOURPICKERCTRL 1 #define wxUSE_COLOURPICKERCTRL 1
#define wxUSE_COMBOBOX 1 #define wxUSE_COMBOBOX 1
#define wxUSE_DATAVIEWCTRL 1 #define wxUSE_DATAVIEWCTRL 1
@ -258,4 +258,5 @@
#define wxUSE_TASKBARBUTTON 0 #define wxUSE_TASKBARBUTTON 0
#define wxUSE_ADDREMOVECTRL 0 #define wxUSE_ADDREMOVECTRL 0
#define wxUSE_ACTIVITYINDICATOR 0 #define wxUSE_ACTIVITYINDICATOR 0
#define wxUSE_WINRT 0
#endif #endif

1
build/wx/wxWidgets.vcxproj
View File

@ -369,6 +369,7 @@
<ClCompile Include="$(SrcDir)src\msw\stattext.cpp" /> <ClCompile Include="$(SrcDir)src\msw\stattext.cpp" />
<ClCompile Include="$(SrcDir)src\msw\statusbar.cpp" /> <ClCompile Include="$(SrcDir)src\msw\statusbar.cpp" />
<ClCompile Include="$(SrcDir)src\msw\stdpaths.cpp" /> <ClCompile Include="$(SrcDir)src\msw\stdpaths.cpp" />
<ClCompile Include="$(SrcDir)src\msw\systhemectrl.cpp" />
<ClCompile Include="$(SrcDir)src\msw\textctrl.cpp" /> <ClCompile Include="$(SrcDir)src\msw\textctrl.cpp" />
<ClCompile Include="$(SrcDir)src\msw\textentry.cpp" /> <ClCompile Include="$(SrcDir)src\msw\textentry.cpp" />
<ClCompile Include="$(SrcDir)src\msw\textmeasure.cpp" /> <ClCompile Include="$(SrcDir)src\msw\textmeasure.cpp" />

2
vendor/wxWidgets vendored

@ -1 +1 @@
Subproject commit a80aaf4c9c85d2db6d4b698c0cfcb9db90548762 Subproject commit d08c66fcb46dea7d61e4a3565cd09fb4c675a201