Two in one:
[blender.git] / source / blender / src / ghostwinlay.c
index e28b604935a46b78046f340c0496a64a009c43e9..d63574e79f9fc002c3659285bfceebac05301e73 100644 (file)
@@ -62,6 +62,7 @@
 
 #ifdef __APPLE__
 #include <OpenGL/OpenGL.h>
+#define __CARBONSOUND__
 #include <Carbon/Carbon.h>
 
 /*declarations*/
@@ -449,6 +450,7 @@ void window_set_custom_cursor_ex(Window *win, BCursor *cursor, int useBig) {
 
 void window_make_active(Window *win) {
        if (win != active_gl_window) {
+               win->lmbut= 0;  /* keeps hanging when mousepressed while other window opened */
                active_gl_window= win;
                GHOST_ActivateWindowDrawingContext(win->ghostwin);
        }
@@ -712,6 +714,11 @@ void window_get_position(Window *win, int *posx_r, int *posy_r) {
        *posy_r= win->position[1];
 }
 
+const GHOST_TabletData* window_get_tablet_data(Window *win)
+{
+       return GHOST_GetTabletData(win->ghostwin);
+}
+
 void window_get_size(Window *win, int *width_r, int *height_r) {
        *width_r= win->size[0];
        *height_r= win->size[1];