X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6764050d805a7e7575ba7126e2f78bd64db8117..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/cursor.h diff --git a/include/wx/cursor.h b/include/wx/cursor.h index ad1b032752..66d8899419 100644 --- a/include/wx/cursor.h +++ b/include/wx/cursor.h @@ -34,17 +34,18 @@ public: */ -#if defined(__WXPALMOS__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE - #include "wx/palmos/cursor.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE #include "wx/msw/cursor.h" #elif defined(__WXMOTIF__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM #include "wx/motif/cursor.h" #elif defined(__WXGTK20__) - #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #ifdef __WINDOWS__ + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE + #else + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #endif #include "wx/gtk/cursor.h" #elif defined(__WXGTK__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM @@ -52,9 +53,6 @@ public: #elif defined(__WXX11__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/x11/cursor.h" -#elif defined(__WXMGL__) - #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" @@ -62,7 +60,7 @@ public: #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE #include "wx/osx/cursor.h" #elif defined(__WXCOCOA__) - #define wxCURSOR_DEFAULT_TYPE 0 + #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE #include "wx/cocoa/cursor.h" #elif defined(__WXPM__) #define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE