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

@@ -445,23 +445,6 @@ public:
*/
virtual void SetToolBar(wxToolBar* toolBar);
/**
MSW-specific function for accessing the taskbar button under Windows 7 or later.
Returns a wxTaskBarButton pointer representing the taskbar button of the
window under Windows 7 or later. The returned wxTaskBarButton may be
used, if non-@c NULL, to access the functionality including thumbnail
representations, thumbnail toolbars, notification and status overlays,
and progress indicators.
The returned pointer must @em not be deleted, it is owned by the frame
and will be only deleted when the frame itself is destroyed.
This function is not available in the other ports by design, any
occurrences of it in the portable code must be guarded by
@code #ifdef __WXMSW__ @endcode preprocessor guards.
*/
wxTaskBarButton* MSWGetTaskBarButton();
void PushStatusText(const wxString &text, int number = 0);
void PopStatusText(int number = 0);