AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5c169c0cf2
wxWidgets/include/wx/icon.h

73 lines
2.1 KiB
C
Raw Normal View History

Added licence/copyright information git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-04 18:57:50 +00:00
/////////////////////////////////////////////////////////////////////////////
// Name: wx/icon.h
// Purpose: wxIcon base header
// Author: Julian Smart
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-15 00:23:28 +00:00
#ifndef _WX_ICON_H_BASE_
#define _WX_ICON_H_BASE_
Initial revision git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 14:01:55 +00:00
added wxIconLocation; minor fixes to wxIcon on some platforms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 13:39:40 +00:00
#include "wx/iconloc.h"
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 13:09:15 +00:00
introduced wxICON_DEFAULT_TYPE and wxBITMAP_DEFAULT_TYPE; documented these default argument values; matched the wxBitmap and wxIcon interfaces to their real implementations; revised icon.h interface header git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 20:03:14 +00:00
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
// a more readable way to tell
#define wxICON_SCREEN_DEPTH (-1)
introduced wxICON_DEFAULT_TYPE and wxBITMAP_DEFAULT_TYPE; documented these default argument values; matched the wxBitmap and wxIcon interfaces to their real implementations; revised icon.h interface header git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 20:03:14 +00:00
// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE)
// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile()
// functions.
Remove Palm OS port. The platform targeted by this port doesn't exist any more and the port never achieved really working state so remove the code to avoid having to maintain it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 01:05:28 +00:00
#if defined(__WXMSW__)
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 13:09:15 +00:00
#include "wx/msw/icon.h"
Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-10 14:15:17 +00:00
#elif defined(__WXMOTIF__)
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
1. wxTimer::Start() returns bool in wxGTK too (other minor corrections to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-12 13:09:15 +00:00
#include "wx/motif/icon.h"
Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__ being GTK1, oh well. Might have missed some. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 03:27:34 +00:00
#elif defined(__WXGTK20__)
Use bitmaps from resources by default in wxGTK under Windows. Use wxBITMAP_TYPE_{BMP,CUR,ICON}_RESOURCE by default under Windows, even for non-wxMSW ports. Also allow loading wxImage from resources in all ports under MSW as a side effect of this change. Closes #14425. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:23 +00:00
#ifdef __WINDOWS__
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
#else
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#endif
moved wxIcon implementation for ports where it's identical to wxBitmap to generic/icon.{cpp,h} so that the same code is not duplicated several times git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-09 17:59:30 +00:00
#include "wx/generic/icon.h"
Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__ being GTK1, oh well. Might have missed some. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 03:27:34 +00:00
#elif defined(__WXGTK__)
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
moved wxIcon implementation for ports where it's identical to wxBitmap to generic/icon.{cpp,h} so that the same code is not duplicated several times git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-09 17:59:30 +00:00
#include "wx/generic/icon.h"
Reformatted Motif headers; added __WXX11__ symbol support to common headers; added place-holding src/x11 and include/wx/x11 files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-05 16:34:33 +00:00
#elif defined(__WXX11__)
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
moved wxIcon implementation for ports where it's identical to wxBitmap to generic/icon.{cpp,h} so that the same code is not duplicated several times git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-09 17:59:30 +00:00
#include "wx/generic/icon.h"
initial (not yet working) code for DirectFB port git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-27 09:42:42 +00:00
#elif defined(__WXDFB__)
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
initial (not yet working) code for DirectFB port git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-27 09:42:42 +00:00
#include "wx/generic/icon.h"
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-15 00:23:28 +00:00
#elif defined(__WXMAC__)
forward to generic implementations where the corresponding osx variant doesn't have an implementation yet git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-02 11:50:44 +00:00
#if wxOSX_USE_COCOA_OR_CARBON
complete rev55777 with some icon.h modifications which I missed in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 21:09:36 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE
forgotten commit of header change for generic icon
2018-09-21 14:15:58 +00:00
#include "wx/generic/icon.h"
osx regrouping git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 20:22:57 +00:00
#else
forgotten commit of header change for generic icon
2018-09-21 14:15:58 +00:00
// iOS and others
PNG is the native format on iOS git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:53:31 +00:00
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_PNG_RESOURCE
osx regrouping git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 20:22:57 +00:00
#include "wx/generic/icon.h"
#endif
Merge wxQT branch into the trunk. This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-24 01:50:11 +00:00
#elif defined(__WXQT__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/generic/icon.h"
Initial revision git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 14:01:55 +00:00
#endif
Move wxVariant support for GDI classes to their files (and thus away from wxBase). Add export declaration field for variant macros. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 20:45:15 +00:00
//-----------------------------------------------------------------------------
// wxVariant support
//-----------------------------------------------------------------------------
#if wxUSE_VARIANT
#include "wx/variant.h"
substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-26 15:06:00 +00:00
DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)
Move wxVariant support for GDI classes to their files (and thus away from wxBase). Add export declaration field for variant macros. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-30 20:45:15 +00:00
#endif
Initial revision git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-20 14:01:55 +00:00
#endif
Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-15 00:23:28 +00:00
// _WX_ICON_H_BASE_
Reference in New Issue Copy Permalink