X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9e4acc5197ac49259b9a39468c5931b4459d87f..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/icon.h?ds=sidebyside diff --git a/include/wx/icon.h b/include/wx/icon.h index 91aca9710b..4bccbc43d9 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,13 +1,22 @@ +///////////////////////////////////////////////////////////////////////////// +// 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_ -/* Commenting out since duplicated in gdicmn.h -// this is for Unix (i.e. now for anything other than MSW) -#undef wxICON -#define wxICON(icon_name) wxIcon(icon_name##_xpm) -*/ +#include "wx/iconloc.h" -#if defined(__WXMSW__) +#if defined(__WXPALMOS__) + #include "wx/palmos/icon.h" +#elif defined(__WXMSW__) #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) #include "wx/motif/icon.h" @@ -19,6 +28,8 @@ #include "wx/mgl/icon.h" #elif defined(__WXMAC__) #include "wx/mac/icon.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/icon.h" #elif defined(__WXPM__) #include "wx/os2/icon.h" #endif