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

Fixed problems with wxFrame::SetIcons

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-03-28 20:51:55 +00:00
parent 33980f0da6
commit 7efaed4de4
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/toplevel.cpp
View File

@@ -191,12 +191,13 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxTopLevelWindowGTK *
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
// reset the icon
wxIcon iconOld = win->GetIcon();
if ( iconOld != wxNullIcon )
wxIconBundle iconsOld = win->GetIcons();
wxIcon tmp = iconsOld.GetIcon( -1 ); // operator != is not-const
if ( tmp != wxNullIcon )
{
wxIcon icon( iconOld );
// wxIconBundle icon( iconOld );
win->SetIcon( wxNullIcon );
win->SetIcon( icon );
win->SetIcons( iconsOld );
}
// we set the focus to the child that accepts the focus. this
@@ -840,13 +841,13 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
GdkWindow* window = m_widget->window;
wxCHECK_RET( window, _T("window not created yet - can't set icon") );
wxTopLevelWindowBase::SetIcons( icons );
DoSetIcon( icons.GetIcon( -1 ) );
wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ),
(WXWindow)GDK_WINDOW_XWINDOW( window ), icons );
if( window )
wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ),
(WXWindow)GDK_WINDOW_XWINDOW( window ), icons );
}
// ----------------------------------------------------------------------------