svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / windowmanager / WM_api.h
index 7acb2921bec39001b613f2c684d477ead67cf57f..ffeb342df778a9c149a88b88e1b1095508ea0661 100644 (file)
@@ -79,7 +79,7 @@ void          WM_keymap_tweak (ListBase *lb, short type, short val, int modifier, short
 ListBase       *WM_keymap_listbase     (struct wmWindowManager *wm, const char *nameid, 
                                                                 int spaceid, int regionid);
 
-char           *WM_key_event_string(short type);
+const char     *WM_key_event_string(short type);
 char           *WM_key_event_operator_string(const struct bContext *C, const char *opname, int opcontext, struct IDProperty *properties, char *str, int len);
 
                        /* handlers */
@@ -129,6 +129,8 @@ int                 WM_operator_redo_popup  (struct bContext *C, struct wmOperator *op);
 
                /* operator api */
 void           WM_operator_free                (struct wmOperator *op);
+void           WM_operator_stack_clear(struct bContext *C);
+
 wmOperatorType *WM_operatortype_find(const char *idname);
 wmOperatorType *WM_operatortype_first(void);
 void           WM_operatortype_append  (void (*opfunc)(wmOperatorType*));
@@ -212,8 +214,8 @@ void                WM_jobs_stop(struct wmWindowManager *wm, void *owner);
 void           WM_jobs_stop_all(struct wmWindowManager *wm);
 
                        /* clipboard */
-char *WM_clipboard_text_get(int selection);
-void WM_clipboard_text_set(char *buf, int selection);
+char           *WM_clipboard_text_get(int selection);
+void           WM_clipboard_text_set(char *buf, int selection);
 
 
 #endif /* WM_API_H */