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

don't use wxApp::GetStdIcon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-24 00:21:26 +00:00
parent 3a72b4eff0
commit 389d906b21
5 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/msgdlgg.cpp
View File

@@ -39,6 +39,7 @@
#include <string.h>
#include "wx/generic/msgdlgg.h"
#include "wx/artprov.h"
#if wxUSE_STATLINE
#include "wx/statline.h"
@@ -72,9 +73,22 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
// 1) icon
if (style & wxICON_MASK)
{
wxStaticBitmap *icon = new wxStaticBitmap(
this, -1, wxTheApp->GetStdIcon((int)(style & wxICON_MASK)));
icon_text->Add( icon, 0, wxCENTER );
wxBitmap bitmap;
switch ( style & wxICON_MASK )
{
case wxICON_ERROR:
bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break;
case wxICON_INFORMATION:
bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break;
case wxICON_WARNING:
bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break;
case wxICON_QUESTION:
bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX); break;
default:
wxFAIL_MSG(_T("incorrect log style"));
}
wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
icon_text->Add( icon, 0, wxCENTER );
}
// 2) text