3f66f6a5b3
This keyword is not expanded by Git which means it's not replaced with the correct revision value in the releases made using git-based scripts and it's confusing to have lines with unexpanded "$Id$" in the released files. As expanding them with Git is not that simple (it could be done with git archive and export-subst attribute) and there are not many benefits in having them in the first place, just remove all these lines. If nothing else, this will make an eventual transition to Git simpler. Closes #14487. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
63 lines
2.0 KiB
C++
63 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/icon.h
|
|
// Purpose: wxIcon implementation for ports where it's same as wxBitmap
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_ICON_H_
|
|
#define _WX_GENERIC_ICON_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxIcon
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
|
|
{
|
|
public:
|
|
wxIcon();
|
|
|
|
wxIcon(const char* const* bits);
|
|
#ifdef wxNEEDS_CHARPP
|
|
wxIcon(char **bits);
|
|
#endif
|
|
|
|
// For compatibility with wxMSW where desired size is sometimes required to
|
|
// distinguish between multiple icons in a resource.
|
|
wxIcon( const wxString& filename,
|
|
wxBitmapType type = wxICON_DEFAULT_TYPE,
|
|
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
|
|
wxBitmap(filename, type)
|
|
{
|
|
}
|
|
|
|
wxIcon(const wxIconLocation& loc)
|
|
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
|
{
|
|
}
|
|
|
|
bool LoadFile(const wxString& name, wxBitmapType flags,
|
|
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
|
|
{ return wxBitmap::LoadFile(name, flags); }
|
|
|
|
// unhide the base class version
|
|
virtual bool LoadFile(const wxString& name,
|
|
wxBitmapType flags = wxICON_DEFAULT_TYPE)
|
|
{ return wxBitmap::LoadFile(name, flags); }
|
|
|
|
// create from bitmap (which should have a mask unless it's monochrome):
|
|
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
|
// ctors, assignment operators...), but it's ok to have such function
|
|
void CopyFromBitmap(const wxBitmap& bmp);
|
|
|
|
private:
|
|
DECLARE_DYNAMIC_CLASS(wxIcon)
|
|
};
|
|
|
|
#endif // _WX_GENERIC_ICON_H_
|