Reverting failed mering of SOC2014_TASKBAR.

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

View File

@@ -658,8 +658,6 @@
#define wxUSE_TASKBARICON_BALLOONS 0
#define wxUSE_TASKBARBUTTON 0
#define wxUSE_UXTHEME 0
#define wxUSE_INKEDIT 0