Fix rebase error.

Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 14:54:20 +00:00
parent 30015f9cfe
commit 6795b5c1af
7 changed files with 15 additions and 158 deletions

View File

@@ -27,7 +27,6 @@ class WXDLLIMPEXP_FWD_CORE ICustomDestinationList;
class WXDLLIMPEXP_FWD_CORE IApplicationDocumentLists;
}
/**
State of the task bar button.
*/
@@ -255,10 +254,6 @@ private:
bool m_frequent_visible;
};
#if defined(__WXMSW__)
#include "wx/msw/taskbarbutton.h"
#endif
#endif // wxUSE_TASKBARBUTTON
#endif // _WX_TASKBARBUTTON_H_