df13791078
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
72 lines
2.0 KiB
C
72 lines
2.0 KiB
C
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/icon.h
|
|
// Purpose: wxIcon base header
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// 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(__WXQT__)
|
|
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
|
#include "wx/generic/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_
|