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

24
include/wx/msw/cursor.h
View File

@@ -16,27 +16,11 @@
#pragma interface "cursor.h" #pragma interface "cursor.h"
#endif #endif
// compatible (even if incorrect) behaviour by default: derive wxCursor from #include "wx/msw/gdiimage.h"
// 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
class WXDLLEXPORT wxImage; class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxCursorRefData : public wxCursorRefDataBase class WXDLLEXPORT wxCursorRefData : public wxGDIImageRefData
{ {
public: public:
wxCursorRefData(); wxCursorRefData();
@@ -50,14 +34,14 @@ public:
}; };
// Cursor // Cursor
class WXDLLEXPORT wxCursor : public wxCursorBase class WXDLLEXPORT wxCursor : public wxGDIImage
{ {
public: public:
wxCursor(); wxCursor();
// Copy constructors // Copy constructors
wxCursor(const wxCursor& cursor) { Ref(cursor); } wxCursor(const wxCursor& cursor) { Ref(cursor); }
wxCursor(const wxImage & image) ; wxCursor(const wxImage& image);
wxCursor(const char bits[], int width, int height, wxCursor(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1, int hotSpotX = -1, int hotSpotY = -1,
const char maskBits[] = NULL); const char maskBits[] = NULL);

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

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

13
include/wx/msw/setup0.h
View File

@@ -62,19 +62,6 @@
// Recommended setting: 0 (please update your code) // Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1 #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. // 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. // 1.64 and later define point sizes to be compatible with Windows.
// //