Merging r39251 through r39311 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / windowmanager / WM_api.h
index 29d54d34acee0419080c675f4834b098efbc7f4b..9805703d7edf815e239418ab984864d754c9e1a3 100644 (file)
@@ -179,7 +179,7 @@ void                WM_operator_free                (struct wmOperator *op);
 void           WM_operator_stack_clear(struct wmWindowManager *wm);
 
 struct wmOperatorType *WM_operatortype_find(const char *idnamem, int quiet);
-struct wmOperatorType *WM_operatortype_first(void);
+struct GHashIterator *WM_operatortype_iter(void);
 void           WM_operatortype_append  (void (*opfunc)(struct wmOperatorType*));
 void           WM_operatortype_append_ptr      (void (*opfunc)(struct wmOperatorType*, void *), void *userdata);
 void           WM_operatortype_append_macro_ptr        (void (*opfunc)(struct wmOperatorType*, void *), void *userdata);
@@ -230,6 +230,7 @@ void                WM_operator_bl_idname(char *to, const char *from);
 void           WM_operator_py_idname(char *to, const char *from);
 
 /* *************** menu types ******************** */
+void                           WM_menutype_init(void);
 struct MenuType                *WM_menutype_find(const char *idname, int quiet);
 int                                    WM_menutype_add(struct MenuType* mt);
 int                                    WM_menutype_contains(struct MenuType* mt);