Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting failed mering of SOC2014_TASKBAR.

Browse Source 
Command: git svn dcommit is aborted, and the two branches is diverged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chaobin, Zhang
2014-09-10 11:57:58 +00:00
parent f0269755aa
commit 23ce61c395
21 changed files with 2 additions and 1450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/files.bkl
View File

@@ -1204,7 +1204,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xpmdecod.h
wx/xpmhand.h
wx/xrc/xmlreshandler.h
wx/taskbarbutton.h
</set>
<!-- ====================================================================== -->
@@ -2002,7 +2001,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/textentry.cpp
src/msw/tglbtn.cpp
src/msw/treectrl.cpp
src/msw/taskbarbutton.cpp
</set>
<set var="MSW_HDR" hints="files">
wx/generic/clrpickerg.h
@@ -2098,7 +2096,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/toplevel.h
wx/msw/treectrl.h
wx/msw/window.h
wx/msw/taskbarbutton.h
</set>
<set var="MSW_RSC" hints="files">
<!-- Resources must be installed together with headers: -->

3
build/files
View File

@@ -757,7 +757,6 @@ GUI_CMN_HDR =
wx/statbox.h
wx/stattext.h
wx/statusbr.h
wx/taskbarbutton.h
wx/testing.h
wx/textcompleter.h
wx/textctrl.h
@@ -1626,7 +1625,6 @@ MSW_SRC =
src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
src/msw/taskbarbutton.cpp
src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
@@ -1718,7 +1716,6 @@ MSW_HDR =
wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
wx/msw/taskbarbutton.h
wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h

5
build/msw/wx_core.vcxproj
View File

@@ -1002,7 +1002,6 @@
<ClCompile Include="..\..\src\generic\vlbox.cpp" />
<ClCompile Include="..\..\src\generic\vscroll.cpp" />
<ClCompile Include="..\..\src\xrc\xmlreshandler.cpp" />
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1123,7 +1122,6 @@
<ClInclude Include="..\..\include\wx\msw\statline.h" />
<ClInclude Include="..\..\include\wx\msw\stattext.h" />
<ClInclude Include="..\..\include\wx\msw\statusbar.h" />
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\msw\textctrl.h" />
<ClInclude Include="..\..\include\wx\msw\textentry.h" />
<ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@@ -1329,7 +1327,6 @@
<ClInclude Include="..\..\include\wx\statline.h" />
<ClInclude Include="..\..\include\wx\stattext.h" />
<ClInclude Include="..\..\include\wx\statusbr.h" />
<ClInclude Include="..\..\include\wx\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\tbarbase.h" />
<ClInclude Include="..\..\include\wx\textcompleter.h" />
<ClInclude Include="..\..\include\wx\textctrl.h" />
@@ -1373,4 +1370,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

11
build/msw/wx_core.vcxproj.filters
View File

@@ -837,9 +837,6 @@
<ClCompile Include="..\..\src\msw\statusbar.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\textctrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -1615,9 +1612,6 @@
<ClInclude Include="..\..\include\wx\msw\statusbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\textctrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1798,9 +1792,6 @@
<ClInclude Include="..\..\include\wx\statusbr.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\taskbarbutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\tbarbase.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1912,4 +1903,4 @@
<Filter>MSW Headers</Filter>
</CustomBuild>
</ItemGroup>
</Project>
</Project>