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.
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/cursor.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_CURSOR_H_
|
|
#define _WX_GTK_CURSOR_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 // wxUSE_IMAGE
|
|
wxCursor(const wxString& name,
|
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
|
int hotSpotX = 0, int hotSpotY = 0);
|
|
wxCursor( const char bits[], int width, int height,
|
|
int hotSpotX = -1, int hotSpotY = -1,
|
|
const char maskBits[] = NULL,
|
|
const wxColour* fg = NULL, const wxColour* bg = NULL);
|
|
|
|
virtual wxPoint GetHotSpot() const wxOVERRIDE;
|
|
|
|
virtual ~wxCursor();
|
|
|
|
// implementation
|
|
|
|
GdkCursor *GetCursor() const;
|
|
|
|
protected:
|
|
void InitFromStock(wxStockCursor);
|
|
#if wxUSE_IMAGE
|
|
void InitFromImage(const wxImage& image);
|
|
#endif
|
|
|
|
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxCursor);
|
|
};
|
|
|
|
#endif // _WX_GTK_CURSOR_H_
|