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

use the main frame icon if no icon is explicitely specified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-08 01:19:31 +00:00
parent ca7adbf8bc
commit cfa6437081
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/aboutdlgg.cpp
View File

@@ -81,8 +81,20 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
#if wxUSE_STATBMP #if wxUSE_STATBMP
if ( info.HasIcon() ) wxIcon icon = info.GetIcon();
sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, info.GetIcon())); if ( !icon.Ok() && wxTheApp )
{
const wxTopLevelWindow * const
tlw = wxDynamicCast(wxTheApp->GetTopWindow(), wxTopLevelWindow);
if ( tlw )
icon = tlw->GetIcon();
}
if ( icon.Ok() )
{
sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, icon),
wxSizerFlags().Border(wxRIGHT));
}
#endif // wxUSE_STATBMP #endif // wxUSE_STATBMP
sizerIconAndText->Add(m_sizerText, wxSizerFlags(1).Expand()); sizerIconAndText->Add(m_sizerText, wxSizerFlags(1).Expand());