Switch to using wxArtProvider::GetBitmap instead of GetIcon so if the
original image has alpha it is preserved on MSW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -776,21 +776,21 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
|
|||||||
switch ( style & wxICON_MASK )
|
switch ( style & wxICON_MASK )
|
||||||
{
|
{
|
||||||
case wxICON_ERROR:
|
case wxICON_ERROR:
|
||||||
bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
|
bitmap = wxArtProvider::GetBitmap(wxART_ERROR, wxART_MESSAGE_BOX);
|
||||||
#ifdef __WXPM__
|
#ifdef __WXPM__
|
||||||
bitmap.SetId(wxICON_SMALL_ERROR);
|
bitmap.SetId(wxICON_SMALL_ERROR);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxICON_INFORMATION:
|
case wxICON_INFORMATION:
|
||||||
bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
|
bitmap = wxArtProvider::GetBitmap(wxART_INFORMATION, wxART_MESSAGE_BOX);
|
||||||
#ifdef __WXPM__
|
#ifdef __WXPM__
|
||||||
bitmap.SetId(wxICON_SMALL_INFO);
|
bitmap.SetId(wxICON_SMALL_INFO);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxICON_WARNING:
|
case wxICON_WARNING:
|
||||||
bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
|
bitmap = wxArtProvider::GetBitmap(wxART_WARNING, wxART_MESSAGE_BOX);
|
||||||
#ifdef __WXPM__
|
#ifdef __WXPM__
|
||||||
bitmap.SetId(wxICON_SMALL_WARNING);
|
bitmap.SetId(wxICON_SMALL_WARNING);
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user