X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index b4ecbd07a1..2f000c4aa4 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -6,7 +6,7 @@ // Created: 10/09/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ @@ -16,23 +16,11 @@ // headers // ---------------------------------------------------------------------------- -// compatible (even if incorrect) behaviour by default: derive wxIcon from -// wxBitmap -#ifndef wxICON_IS_BITMAP - #define wxICON_IS_BITMAP 1 -#endif - #include "wx/bitmap.h" -#if wxICON_IS_BITMAP +#include "wx/os2/gdiimage.h" - #define wxIconRefDataBase wxBitmapRefData - #define wxIconBase wxBitmap -#else - #include "wx/os2/gdiimage.h" - - #define wxIconRefDataBase wxGDIImageRefData - #define wxIconBase wxGDIImage -#endif +#define wxIconRefDataBase wxGDIImageRefData +#define wxIconBase wxGDIImage class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase {