72500faf7c
This just uses the existing wxImage ctor from XPM data and wxCursor ctor from wxImage, but will allow the code creating cursors from XPM to still work even when wxImage ctor from XPM is made explicit. Add a trivial test just to check that the new ctor can be used.
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/cursor.h
|
|
// Purpose: wxCursor class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CURSOR_H_
|
|
#define _WX_CURSOR_H_
|
|
|
|
#include "wx/colour.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxImage;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxCursor
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
|
|
{
|
|
public:
|
|
wxCursor();
|
|
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxCursor(int id) { InitFromStock((wxStockCursor)id); }
|
|
#endif
|
|
#if wxUSE_IMAGE
|
|
wxCursor( const wxImage & image );
|
|
wxCursor(const char* const* xpmData);
|
|
#endif
|
|
|
|
wxCursor(const wxString& name,
|
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
|
int hotSpotX = 0, int hotSpotY = 0);
|
|
virtual ~wxCursor();
|
|
|
|
// implementation
|
|
|
|
WXCursor GetCursor() const;
|
|
|
|
protected:
|
|
void InitFromStock(wxStockCursor);
|
|
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxCursor);
|
|
};
|
|
|
|
#endif // _WX_CURSOR_H_
|