Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxICON_IS_BITMAP, it is now always (implicitly) set to 0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-25 13:06:00 +00:00
parent e0d8fb4572
commit c781807d89
3 changed files with 7 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/msw/icon.h
View File

@@ -20,23 +20,7 @@
// headers
// ----------------------------------------------------------------------------
// compatible (even if incorrect) behaviour by default: derive wxIcon from
// wxBitmap
#ifndef wxICON_IS_BITMAP
#define wxICON_IS_BITMAP 0
#endif
#if wxICON_IS_BITMAP
#include "wx/bitmap.h"
#define wxIconRefDataBase wxBitmapRefData
#define wxIconBase wxBitmap
#else
#include "wx/msw/gdiimage.h"
#define wxIconRefDataBase wxGDIImageRefData
#define wxIconBase wxGDIImage
#endif
#include "wx/msw/gdiimage.h"
// ---------------------------------------------------------------------------
// icon data
@@ -44,7 +28,7 @@
// notice that although wxIconRefData inherits from wxBitmapRefData, it is not
// a valid wxBitmapRefData
class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase
class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
{
public:
wxIconRefData() { }
@@ -57,7 +41,7 @@ public:
// Icon
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxIcon : public wxIconBase
class WXDLLEXPORT wxIcon : public wxGDIImage
{
public:
// ctors