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"
#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);