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

Coding style fix.

Browse Source 
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chaobin, Zhang
2014-09-10 09:16:49 +00:00
parent c17570e8e2
commit 5505aa80fe
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/msw/taskbarbutton.cpp
View File

@@ -30,7 +30,7 @@
namespace { namespace {
// The maximum number of thumbnail toolbar buttons allowed on windows is 7. // The maximum number of thumbnail toolbar buttons allowed on windows is 7.
static const int LIMITED_BUTTON_SIZE = 7; static const int MAX_BUTTON_COUNT = 7;
DEFINE_GUID(wxCLSID_TaskbarList, DEFINE_GUID(wxCLSID_TaskbarList,
0x56fdf344, 0xfd6d, 0x11d0, 0x95, 0x8a, 0x0, 0x60, 0x97, 0xc9, 0xa0, 0x90); 0x56fdf344, 0xfd6d, 0x11d0, 0x95, 0x8a, 0x0, 0x60, 0x97, 0xc9, 0xa0, 0x90);
@@ -175,8 +175,8 @@ void wxTaskBarButtonImpl::SetThumbnailContents(const wxWindow *child)
bool wxTaskBarButtonImpl::AppendThumbBarButton(wxThumbBarButton *button) bool wxTaskBarButtonImpl::AppendThumbBarButton(wxThumbBarButton *button)
{ {
if ( m_thumbBarButtons.size() >= LIMITED_BUTTON_SIZE ) wxASSERT_MSG( m_thumbBarButtons.size() < MAX_BUTTON_COUNT,
return false; "Number of thumb buttons is limited to 7" );
m_thumbBarButtons.push_back(button); m_thumbBarButtons.push_back(button);
return InitOrUpdateThumbBarButtons(); return InitOrUpdateThumbBarButtons();
@@ -185,9 +185,10 @@ bool wxTaskBarButtonImpl::AppendThumbBarButton(wxThumbBarButton *button)
bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos, bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos,
wxThumbBarButton *button) wxThumbBarButton *button)
{ {
if ( m_thumbBarButtons.size() >= LIMITED_BUTTON_SIZE || wxASSERT_MSG( m_thumbBarButtons.size() < MAX_BUTTON_COUNT,
m_thumbBarButtons.size() < pos ) "Number of thumb buttons is limited to 7" );
return false; wxASSERT_MSG( pos <= m_thumbBarButtons.size(),
"Invalid index when inserting the button" );
m_thumbBarButtons.insert(m_thumbBarButtons.begin() + pos, button); m_thumbBarButtons.insert(m_thumbBarButtons.begin() + pos, button);
return InitOrUpdateThumbBarButtons(); return InitOrUpdateThumbBarButtons();
@@ -195,12 +196,13 @@ bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos,
bool wxTaskBarButtonImpl::RemoveThumbBarButton(wxThumbBarButton *button) bool wxTaskBarButtonImpl::RemoveThumbBarButton(wxThumbBarButton *button)
{ {
wxThumbBarButtons::iterator it; for ( wxThumbBarButtons::iterator iter = m_thumbBarButtons.begin();
for ( it = m_thumbBarButtons.begin(); it != m_thumbBarButtons.end(); ++it ) iter != m_thumbBarButtons.end();
++iter )
{ {
if ( button == *it ) if ( button == *iter )
{ {
m_thumbBarButtons.erase(it); m_thumbBarButtons.erase(iter);
return InitOrUpdateThumbBarButtons(); return InitOrUpdateThumbBarButtons();
} }
} }
@@ -210,12 +212,13 @@ bool wxTaskBarButtonImpl::RemoveThumbBarButton(wxThumbBarButton *button)
bool wxTaskBarButtonImpl::RemoveThumbBarButton(int id) bool wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
{ {
wxThumbBarButtons::iterator it; for ( wxThumbBarButtons::iterator iter = m_thumbBarButtons.begin();
for ( it = m_thumbBarButtons.begin(); it != m_thumbBarButtons.end(); ++it ) iter != m_thumbBarButtons.end();
++iter )
{ {
if ( id == (*it)->GetID() ) if ( id == (*iter)->GetID() )
{ {
m_thumbBarButtons.erase(it); m_thumbBarButtons.erase(iter);
return InitOrUpdateThumbBarButtons(); return InitOrUpdateThumbBarButtons();
} }
} }
@@ -225,11 +228,10 @@ bool wxTaskBarButtonImpl::RemoveThumbBarButton(int id)
bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons() bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons()
{ {
THUMBBUTTON buttons[LIMITED_BUTTON_SIZE]; THUMBBUTTON buttons[MAX_BUTTON_COUNT];
size_t i;
HRESULT hr; HRESULT hr;
for ( i = 0; i < LIMITED_BUTTON_SIZE; ++i ) for ( size_t i = 0; i < MAX_BUTTON_COUNT; ++i )
{ {
memset(&buttons[i], 0, sizeof buttons[i]); memset(&buttons[i], 0, sizeof buttons[i]);
buttons[i].iId = i; buttons[i].iId = i;
@@ -237,7 +239,7 @@ bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons()
buttons[i].dwMask = static_cast<THUMBBUTTONMASK>(THB_FLAGS); buttons[i].dwMask = static_cast<THUMBBUTTONMASK>(THB_FLAGS);
} }
for ( i = 0; i < m_thumbBarButtons.size(); ++i ) for ( size_t i = 0; i < m_thumbBarButtons.size(); ++i )
{ {
buttons[i].hIcon = GetHiconOf(m_thumbBarButtons[i]->GetIcon()); buttons[i].hIcon = GetHiconOf(m_thumbBarButtons[i]->GetIcon());
buttons[i].dwFlags = GetNativeThumbButtonFlags(*m_thumbBarButtons[i]); buttons[i].dwFlags = GetNativeThumbButtonFlags(*m_thumbBarButtons[i]);
@@ -248,8 +250,7 @@ bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons()
// Truncate the tooltip if its length longer than szTip(THUMBBUTTON) // Truncate the tooltip if its length longer than szTip(THUMBBUTTON)
// allowed length (260). // allowed length (260).
if ( tooltip.length() > WXSIZEOF(buttons[i].szTip) ) tooltip.Truncate(260);
tooltip = tooltip.SubString(0, WXSIZEOF(buttons[i].szTip) - 1);
wxStrlcpy(buttons[i].szTip, tooltip.t_str(), tooltip.length()); wxStrlcpy(buttons[i].szTip, tooltip.t_str(), tooltip.length());
buttons[i].dwMask = buttons[i].dwMask =
static_cast<THUMBBUTTONMASK>(buttons[i].dwMask | THB_TOOLTIP); static_cast<THUMBBUTTONMASK>(buttons[i].dwMask | THB_TOOLTIP);
@@ -258,7 +259,7 @@ bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons()
if ( !m_hasInitThumbnailToolbar ) if ( !m_hasInitThumbnailToolbar )
{ {
hr = m_taskbarList->ThumbBarAddButtons(m_hwnd, hr = m_taskbarList->ThumbBarAddButtons(m_hwnd,
LIMITED_BUTTON_SIZE, MAX_BUTTON_COUNT,
buttons); buttons);
if ( FAILED(hr) ) if ( FAILED(hr) )
{ {
@@ -269,7 +270,7 @@ bool wxTaskBarButtonImpl::InitOrUpdateThumbBarButtons()
else else
{ {
hr = m_taskbarList->ThumbBarUpdateButtons(m_hwnd, hr = m_taskbarList->ThumbBarUpdateButtons(m_hwnd,
LIMITED_BUTTON_SIZE, MAX_BUTTON_COUNT,
buttons); buttons);
if ( FAILED(hr) ) if ( FAILED(hr) )
{ {