X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e64df9bcc331d49d05a6dc7729ee08071e4c6408..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/cursor.h diff --git a/include/wx/cursor.h b/include/wx/cursor.h index 4f845c6605..ad1b032752 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -1,22 +1,72 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/cursor.h +// Purpose: wxCursor base header +// Author: Julian Smart +// Modified by: +// Created: +// Copyright: (c) Julian Smart +// RCS-ID: $Id$ +// Licence: wxWindows Licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_CURSOR_H_BASE_ #define _WX_CURSOR_H_BASE_ -#if defined(__WXMSW__) -#include "wx/msw/cursor.h" +#include "wx/defs.h" + +/* + wxCursor classes should have the following public API: + +class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject +{ +public: + wxCursor(); + wxCursor(const wxImage& 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(); +}; + +*/ + +#if defined(__WXPALMOS__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/palmos/cursor.h" +#elif defined(__WXMSW__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/msw/cursor.h" #elif defined(__WXMOTIF__) -#include "wx/motif/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM + #include "wx/motif/cursor.h" +#elif defined(__WXGTK20__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/gtk/cursor.h" #elif defined(__WXGTK__) -#include "wx/gtk/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/gtk1/cursor.h" #elif defined(__WXX11__) -#include "wx/x11/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/x11/cursor.h" #elif defined(__WXMGL__) -#include "wx/mgl/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/mgl/cursor.h" +#elif defined(__WXDFB__) + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/dfb/cursor.h" #elif defined(__WXMAC__) -#include "wx/mac/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE + #include "wx/osx/cursor.h" #elif defined(__WXCOCOA__) -#include "wx/cocoa/cursor.h" + #define wxCURSOR_DEFAULT_TYPE 0 + #include "wx/cocoa/cursor.h" #elif defined(__WXPM__) -#include "wx/os2/cursor.h" + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #include "wx/os2/cursor.h" #endif #include "wx/utils.h"