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.
56 lines
1.4 KiB
C++
56 lines
1.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/cursor.h
|
|
// Purpose: wxCursor class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CURSOR_H_
|
|
#define _WX_CURSOR_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
|
|
// Cursor
|
|
class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
|
|
{
|
|
public:
|
|
wxCursor();
|
|
|
|
#if wxUSE_IMAGE
|
|
wxCursor(const wxImage & image) ;
|
|
wxCursor(const char* const* xpmData);
|
|
#endif // wxUSE_IMAGE
|
|
wxCursor(const wxString& name,
|
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
|
int hotSpotX = 0, int hotSpotY = 0);
|
|
|
|
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxCursor(int id) { InitFromStock((wxStockCursor)id); }
|
|
#endif
|
|
virtual ~wxCursor();
|
|
|
|
void MacInstall() const ;
|
|
|
|
void SetHCURSOR(WXHCURSOR cursor);
|
|
WXHCURSOR GetHCURSOR() const;
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
|
|
|
private:
|
|
void InitFromStock(wxStockCursor);
|
|
|
|
#if wxUSE_IMAGE
|
|
void InitFromImage(const wxImage & image) ;
|
|
#endif // wxUSE_IMAGE
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxCursor);
|
|
};
|
|
|
|
#endif // _WX_CURSOR_H_
|