Commit of cursor framework. Cursors now defined in source/blender/src/cursors.c and

[blender.git] / intern / ghost / intern / GHOST_Window.cpp

diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp
index a21233d4475643c3c67f9fcdd91402151dbb119b..f4f7c5818142fbcfa14fe25c77bf93077ae9263a 100644 (file)
--- a/intern/ghost/intern/GHOST_Window.cpp
+++ b/intern/ghost/intern/GHOST_Window.cpp
@@ -107,9 +107,18 @@ GHOST_TSuccess GHOST_Window::setCursorShape(GHOST_TStandardCursor cursorShape)
        }
 }
 
-GHOST_TSuccess GHOST_Window::setCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY)
+GHOST_TSuccess GHOST_Window::setCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2],
+                                                                                                        int hotX, int hotY)
 {
-       if (setWindowCustomCursorShape(bitmap, mask, hotX, hotY)) {
+       return setCustomCursorShape( (GHOST_TUns8 *)bitmap, (GHOST_TUns8 *)mask, 
+                                                                       16, 16, hotX, hotY, 0, 1 );
+}
+
+GHOST_TSuccess GHOST_Window::setCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, 
+                                                                                                       int sizex, int sizey, int hotX, int hotY,
+                                                                                                       int fg_color, int bg_color )
+{
+       if (setWindowCustomCursorShape(bitmap, mask, sizex, sizey,hotX, hotY, fg_color, bg_color)) {
                m_cursorShape = GHOST_kStandardCursorCustom;
                return GHOST_kSuccess;
        }