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

Expose setting description of overlay icon for accessibility.

Browse Source 
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chaobin, Zhang
2014-09-10 08:56:50 +00:00
parent 09ccad0b65
commit 4318edc865
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/taskbarbutton.h
View File

@@ -26,7 +26,8 @@ public:
virtual void Hide() wxOVERRIDE; virtual void Hide() wxOVERRIDE;
virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE; virtual void SetThumbnailTooltip(const wxString& tooltip) wxOVERRIDE;
virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE; virtual void SetProgressState(wxTaskBarButtonState state) wxOVERRIDE;
virtual void SetOverlayIcon(const wxIcon& icon) wxOVERRIDE; virtual void SetOverlayIcon(const wxIcon& icon,
const wxString& description = wxString()) wxOVERRIDE;
virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE; virtual void SetThumbnailClip(const wxRect& rect) wxOVERRIDE;
virtual bool AddThumbBarButton(wxThumbBarButton *button) wxOVERRIDE; virtual bool AddThumbBarButton(wxThumbBarButton *button) wxOVERRIDE;
virtual void ShowThumbnailToolbar() wxOVERRIDE; virtual void ShowThumbnailToolbar() wxOVERRIDE;

5
include/wx/taskbarbutton.h
View File

@@ -33,7 +33,7 @@ class WXDLLIMPEXP_ADV wxThumbBarButton {
public: public:
wxThumbBarButton(int id, wxThumbBarButton(int id,
const wxIcon& icon, const wxIcon& icon,
const wxString& tooltip = wxEmptyString); const wxString& tooltip = wxString());
virtual ~wxThumbBarButton() {} virtual ~wxThumbBarButton() {}
@@ -59,7 +59,8 @@ public:
virtual void Hide() = 0; virtual void Hide() = 0;
virtual void SetThumbnailTooltip(const wxString& tooltip) = 0; virtual void SetThumbnailTooltip(const wxString& tooltip) = 0;
virtual void SetProgressState(wxTaskBarButtonState state) = 0; virtual void SetProgressState(wxTaskBarButtonState state) = 0;
virtual void SetOverlayIcon(const wxIcon& icon) = 0; virtual void SetOverlayIcon(const wxIcon& icon,
const wxString& description = wxString()) = 0;
virtual void SetThumbnailClip(const wxRect& rect) = 0; virtual void SetThumbnailClip(const wxRect& rect) = 0;
/** /**

7
src/msw/taskbarbutton.cpp
View File

@@ -96,9 +96,12 @@ void wxTaskBarButtonImpl::SetProgressState(wxTaskBarButtonState state)
m_taskbarList->SetProgressState(m_hwnd, static_cast<TBPFLAG>(state)); m_taskbarList->SetProgressState(m_hwnd, static_cast<TBPFLAG>(state));
} }
void wxTaskBarButtonImpl::SetOverlayIcon(const wxIcon& icon) void wxTaskBarButtonImpl::SetOverlayIcon(const wxIcon& icon,
const wxString& description)
{ {
m_taskbarList->SetOverlayIcon(m_hwnd, GetHiconOf(icon), NULL); m_taskbarList->SetOverlayIcon(m_hwnd,
GetHiconOf(icon),
description.wc_str());
} }
void wxTaskBarButtonImpl::SetThumbnailClip(const wxRect& rect) void wxTaskBarButtonImpl::SetThumbnailClip(const wxRect& rect)