use the main frame icon if no icon is explicitely specified

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index c915bba45d16a27c2eedfee7eb895fa3daf75ef4..2bd702fe67e03d7c2c5d03f9107e2b5d74167987 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -81,8 +81,20 @@ bool wxAboutDialog::Create(const wxAboutDialogInfo& info)
 
     wxSizer *sizerIconAndText = new wxBoxSizer(wxHORIZONTAL);
 #if wxUSE_STATBMP
-    if ( info.HasIcon() )
-        sizerIconAndText->Add(new wxStaticBitmap(this, wxID_ANY, info.GetIcon()));
+    wxIcon icon = 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
     sizerIconAndText->Add(m_sizerText, wxSizerFlags(1).Expand());