From c781807d89448537ba1d6d8627ff153f3ecc581a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Jan 2003 13:06:00 +0000 Subject: [PATCH] removed wxICON_IS_BITMAP, it is now always (implicitly) set to 0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/cursor.h | 24 ++++-------------------- include/wx/msw/icon.h | 22 +++------------------- include/wx/msw/setup0.h | 13 ------------- 3 files changed, 7 insertions(+), 52 deletions(-) diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h index 6d5c213f8a..201dcae705 100644 --- a/include/wx/msw/cursor.h +++ b/include/wx/msw/cursor.h @@ -16,27 +16,11 @@ #pragma interface "cursor.h" #endif -// compatible (even if incorrect) behaviour by default: derive wxCursor from -// wxBitmap -#ifndef wxICON_IS_BITMAP - #define wxICON_IS_BITMAP 0 -#endif - -#if wxICON_IS_BITMAP - #include "wx/bitmap.h" - - #define wxCursorRefDataBase wxBitmapRefData - #define wxCursorBase wxBitmap -#else - #include "wx/msw/gdiimage.h" - - #define wxCursorRefDataBase wxGDIImageRefData - #define wxCursorBase wxGDIImage -#endif +#include "wx/msw/gdiimage.h" class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxCursorRefData : public wxCursorRefDataBase +class WXDLLEXPORT wxCursorRefData : public wxGDIImageRefData { public: wxCursorRefData(); @@ -50,14 +34,14 @@ public: }; // Cursor -class WXDLLEXPORT wxCursor : public wxCursorBase +class WXDLLEXPORT wxCursor : public wxGDIImage { public: wxCursor(); // Copy constructors wxCursor(const wxCursor& cursor) { Ref(cursor); } - wxCursor(const wxImage & image) ; + wxCursor(const wxImage& image); wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1, const char maskBits[] = NULL); diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 5c14c2129f..741874298c 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -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 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 2aa7c461d3..8e32f71b67 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -62,19 +62,6 @@ // Recommended setting: 0 (please update your code) #define WXWIN_COMPATIBILITY_2_4 1 -// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, -// but this is very dangerous because you can mistakenly pass an icon instead -// of a bitmap to a function taking "const wxBitmap&" - which will *not* work -// because an icon is not a valid bitmap -// -// Starting from 2.1.12, you have the choice under this backwards compatible -// behaviour (your code will still compile, but probably won't behave as -// expected!) and not deriving wxIcon class from wxBitmap, but providing a -// conversion ctor wxBitmap(const wxIcon&) instead. -// -// Recommended setting: 0 -#define wxICON_IS_BITMAP 0 - // Define as 1 for font size to be backward compatible to 1.63 and earlier. // 1.64 and later define point sizes to be compatible with Windows. // -- 2.47.2