[Bf-blender-cvs] [208d21d] pie-menus: Merge branch 'master' into pie-menus

[Antony Riakiotakis]

Commit: 208d21d63f80214b41435dc8a629dbe4bfa46734
Author: Antony Riakiotakis
Date:   Thu Jun 5 19:59:07 2014 +0300
https://developer.blender.org/rB208d21d63f80214b41435dc8a629dbe4bfa46734

Merge branch 'master' into pie-menus

Conflicts:
	source/blender/windowmanager/WM_api.h
	source/blender/windowmanager/intern/wm_event_system.c

===================================================================



===================================================================

diff --cc source/blender/windowmanager/WM_api.h
index 208dbc3,9e50b01..9ff236b
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -145,19 -145,22 +145,22 @@@ struct wmEventHandler *WM_event_add_key
  
  void		WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap *keymap);
  
+ typedef int (*wmUIHandlerFunc)(struct bContext *C, const struct wmEvent *event, void *userdata);
+ typedef void (*wmUIHandlerRemoveFunc)(struct bContext *C, void *userdata);
+ 
  struct wmEventHandler *WM_event_add_ui_handler(
          const struct bContext *C, ListBase *handlers,
-         int (*func)(struct bContext *C, const struct wmEvent *event, void *userdata),
-         void (*remove)(struct bContext *C, void *userdata), void *userdata, bool accept_double_press);
- 
- void		WM_event_remove_ui_handler(ListBase *handlers,
-                                        int (*func)(struct bContext *C, const struct wmEvent *event, void *userdata),
-                                        void (*remove)(struct bContext *C, void *userdata),
-                                        void *userdata, const bool postpone);
- void		WM_event_remove_area_handler(struct ListBase *handlers, void *area);
- void		WM_event_free_ui_handler_all(struct bContext *C, ListBase *handlers,
-                                          int (*func)(struct bContext *C, const struct wmEvent *event, void *userdata),
-                                          void (*remove)(struct bContext *C, void *userdata));
+         wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove,
 -        void *userdata);
++        void *userdata,  bool accept_double_press);
+ void WM_event_remove_ui_handler(
+         ListBase *handlers,
+         wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove,
+         void *userdata, const bool postpone);
+ void WM_event_remove_area_handler(
+         struct ListBase *handlers, void *area);
+ void WM_event_free_ui_handler_all(
+         struct bContext *C, ListBase *handlers,
+         wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove);
  
  struct wmEventHandler *WM_event_add_modal_handler(struct bContext *C, struct wmOperator *op);
  void		WM_event_remove_handlers(struct bContext *C, ListBase *handlers);
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index e4a547e,175a8d2..a06d6c9
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -2547,13 -2549,14 +2549,14 @@@ void WM_event_remove_keymap_handler(Lis
  	}
  }
  
- wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers,
-                                         wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove,
-                                         void *userdata, bool accept_double_press)
+ wmEventHandler *WM_event_add_ui_handler(
+         const bContext *C, ListBase *handlers,
+         wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove,
 -        void *userdata)
++        void *userdata, bool accept_double_press)
  {
  	wmEventHandler *handler = MEM_callocN(sizeof(wmEventHandler), "event ui handler");
- 	handler->ui_handle = func;
- 	handler->ui_remove = remove;
+ 	handler->ui_handle = ui_handle;
+ 	handler->ui_remove = ui_remove;
  	handler->ui_userdata = userdata;
  	if (C) {
  		handler->ui_area    = CTX_wm_area(C);