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

Added wxArtProvider::GetMessageBoxIconId().

Browse Source 
This function translates between wxICON_XXX constants and wxART_YYY values. It
was extracted from the existing GetMessageBoxIcon().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-05 22:55:46 +00:00
parent 6a3f8b4f1f
commit 39f6b6ba78
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/artprov.h
View File

@@ -155,10 +155,18 @@ public:
const wxArtClient& client = wxART_OTHER,
const wxSize& size = wxDefaultSize);
// Helper used by GetMessageBoxIcon(): return the art id corresponding to
// the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
// can be set)
static wxArtID GetMessageBoxIconId(int flags);
// Helper used by several generic classes: return the icon corresponding to
// the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
// can be set)
static wxIcon GetMessageBoxIcon(int flags);
static wxIcon GetMessageBoxIcon(int flags)
{
return GetIcon(GetMessageBoxIconId(flags), wxART_MESSAGE_BOX);
}
// Query the providers for iconbundle with given ID and return it. Return
// wxNullIconBundle if no provider provides it.

17
src/common/artprov.cpp
View File

@@ -332,9 +332,8 @@ wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient
}
/* static */
wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
wxArtID wxArtProvider::GetMessageBoxIconId(int flags)
{
wxIcon icon;
switch ( flags & wxICON_MASK )
{
default:
@@ -342,23 +341,17 @@ wxIcon wxArtProvider::GetMessageBoxIcon(int flags)
// fall through
case wxICON_ERROR:
icon = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
break;
return wxART_ERROR;
case wxICON_INFORMATION:
icon = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
break;
return wxART_INFORMATION;
case wxICON_WARNING:
icon = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
break;
return wxART_WARNING;
case wxICON_QUESTION:
icon = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
break;
return wxART_QUESTION;
}
return icon;
}
/*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,