removed 2.0 compatibility stuff (patch 1054261)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
@@ -18,9 +18,6 @@
|
||||
|
||||
#define wxUSE_EXCEPTIONS 1
|
||||
|
||||
// define this to 1 if you want icons to behave as bitmaps
|
||||
#define wxICON_IS_BITMAP 0
|
||||
|
||||
// define this to 0 when building wxBase library
|
||||
#define wxUSE_GUI 1
|
||||
|
||||
|
Reference in New Issue
Block a user