M openbox/grab.c → openbox/grab.c

@@ -111,8 +111,8 @@ 
 void grab_shutdown()
 {
     while (grab_keyboard(FALSE));
-    while (grab_pointer(FALSE, None));
-    while (grab_pointer_window(FALSE, None, None));
+    while (grab_pointer(FALSE, OB_CURSOR_NONE));
+    while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
     while (grab_server(FALSE));
 }
 
@@ -133,7 +133,7 @@ }
 
 void grab_button(guint button, guint state, Window win, guint mask)
 {
-    grab_button_full(button, state, win, mask, GrabModeAsync, None);
+    grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE);
 }
 
 void ungrab_button(guint button, guint state, Window win)

M openbox/menuframe.c → openbox/menuframe.c

@@ -564,7 +564,7 @@ self->parent = parent;
 
     if (menu_frame_visible == NULL) {
         /* no menus shown yet */
-        grab_pointer(TRUE, None);
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         grab_keyboard(TRUE);
     }
 
@@ -605,7 +605,7 @@ menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
 
     if (menu_frame_visible == NULL) {
         /* last menu shown */
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
         grab_keyboard(FALSE);
     }