Fixed copyrights and licence spelling

[wxWidgets.git] / src / univ / topluniv.cpp

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index f16864f80af8e953416a39405a9fb049cbcd0661..35debbc1fe88bb7cc7cf9533ac0e51ebc66e605d 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -296,13 +296,14 @@ int wxTopLevelWindow::GetMinHeight() const
 // icons
 // ----------------------------------------------------------------------------
 
 // icons
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindow::SetIcon(const wxIcon& icon)
+void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)

 {
 {

-    wxTopLevelWindowNative::SetIcon(icon);
+    wxTopLevelWindowNative::SetIcons(icons);

 
     if ( ms_drawDecorations && m_renderer )
     {
         wxSize size = m_renderer->GetFrameIconSize();
 
     if ( ms_drawDecorations && m_renderer )
     {
         wxSize size = m_renderer->GetFrameIconSize();

+        const wxIcon& icon = icons.GetIcon( size );

 
         if ( !icon.Ok() || size.x == -1  )
             m_titlebarIcon = icon;
 
         if ( !icon.Ok() || size.x == -1  )
             m_titlebarIcon = icon;