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
		
	
		
			
				
	
	
		
			76 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			76 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/icon.h
 | |
| // Purpose:     wxIcon base header
 | |
| // Author:      Julian Smart
 | |
| // Modified by:
 | |
| // Created:
 | |
| // Copyright:   (c) Julian Smart
 | |
| // RCS-ID:      $Id$
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_ICON_H_BASE_
 | |
| #define _WX_ICON_H_BASE_
 | |
| 
 | |
| #include "wx/iconloc.h"
 | |
| 
 | |
| 
 | |
| // a more readable way to tell
 | |
| #define wxICON_SCREEN_DEPTH     (-1)
 | |
| 
 | |
| 
 | |
| // the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE)
 | |
| // constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile()
 | |
| // functions.
 | |
| 
 | |
| #if defined(__WXMSW__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
 | |
|   #include "wx/msw/icon.h"
 | |
| #elif defined(__WXMOTIF__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
 | |
|   #include "wx/motif/icon.h"
 | |
| #elif defined(__WXGTK20__)
 | |
|   #ifdef __WINDOWS__
 | |
|     #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
 | |
|   #else
 | |
|     #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
 | |
|   #endif
 | |
|   #include "wx/generic/icon.h"
 | |
| #elif defined(__WXGTK__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
 | |
|   #include "wx/generic/icon.h"
 | |
| #elif defined(__WXX11__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
 | |
|   #include "wx/generic/icon.h"
 | |
| #elif defined(__WXDFB__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
 | |
|   #include "wx/generic/icon.h"
 | |
| #elif defined(__WXMAC__)
 | |
| #if wxOSX_USE_COCOA_OR_CARBON
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
 | |
|   #include "wx/osx/icon.h"
 | |
| #else
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_PNG_RESOURCE
 | |
|   #include "wx/generic/icon.h"
 | |
| #endif
 | |
| #elif defined(__WXCOCOA__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
 | |
|   #include "wx/cocoa/icon.h"
 | |
| #elif defined(__WXPM__)
 | |
|   #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
 | |
|   #include "wx/os2/icon.h"
 | |
| #endif
 | |
| 
 | |
| //-----------------------------------------------------------------------------
 | |
| // wxVariant support
 | |
| //-----------------------------------------------------------------------------
 | |
| 
 | |
| #if wxUSE_VARIANT
 | |
| #include "wx/variant.h"
 | |
| DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)
 | |
| #endif
 | |
| 
 | |
| 
 | |
| #endif
 | |
|     // _WX_ICON_H_BASE_
 |