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

wxIconBundle implementation.

Browse Source 
wxTLW::SetIcons() properly implemented for wxMotif, wxGTK, wxMSW, wxX11, wxUniversal
Placeholders that just call SetIcon for wxOS2 and wxMac.
Regenerated makefiles.
Added hardwired wxSYS_ICON_X/Y = 32 for wxGTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-03-26 21:54:23 +00:00
parent 6b3d51cc35
commit f618020a15
51 changed files with 566 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/x11/toplevel.cpp
View File

@@ -43,6 +43,8 @@
#include "wx/x11/private.h"
#include "X11/Xutil.h"
#include "wx/unix/utilsx11.h"
bool wxMWMIsRunning(Window w);
// ----------------------------------------------------------------------------
@@ -393,11 +395,8 @@ bool wxTopLevelWindowX11::ShowFullScreen(bool show, long style)
// wxTopLevelWindowX11 misc
// ----------------------------------------------------------------------------
void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
{
// this sets m_icon
wxTopLevelWindowBase::SetIcon(icon);
if (icon.Ok() && GetMainWindow())
{
#if wxUSE_NANOX
@@ -419,6 +418,15 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
}
}
void wxTopLevelWindowX11::SetIcons(const wxIconBundle& icons )
{
// this sets m_icon
wxTopLevelWindowBase::SetIcons( icons );
DoSetIcon( icons.GetIcon( -1 ) );
wxSetIconsX11( GetXDisplay(), GetXWindow(), icons );
}
void wxTopLevelWindowX11::SetTitle(const wxString& title)
{
m_title = title;