diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 18b1e7239ed..a19499b3464 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -75,7 +75,8 @@ typedef struct wmDropBoxMap { } wmDropBoxMap; -ListBase *WM_dropboxmap_find(char *idname, int spaceid, int regionid) +/* spaceid/regionid is zero for window drop maps */ +ListBase *WM_dropboxmap_find(const char *idname, int spaceid, int regionid) { wmDropBoxMap *dm; @@ -103,6 +104,7 @@ wmDropBox *WM_dropbox_add(ListBase *lb, const char *idname, int (*poll)(bContext drop->poll= poll; drop->copy= copy; drop->ot= WM_operatortype_find(idname, 0); + drop->opcontext= WM_OP_INVOKE_DEFAULT; if(drop->ot==NULL) { MEM_freeN(drop); @@ -167,7 +169,7 @@ void WM_event_drag_image(wmDrag *drag, ImBuf *imb, float scale, int sx, int sy) } -static char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag, wmEvent *event) +static const char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag, wmEvent *event) { wmEventHandler *handler= handlers->first; for(; handler; handler= handler->next) { @@ -183,12 +185,12 @@ static char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag, wmEve } /* return active operator name when mouse is in box */ -static char *wm_dropbox_active(bContext *C, wmDrag *drag, wmEvent *event) +static const char *wm_dropbox_active(bContext *C, wmDrag *drag, wmEvent *event) { wmWindow *win= CTX_wm_window(C); ScrArea *sa= CTX_wm_area(C); ARegion *ar= CTX_wm_region(C); - char *name; + const char *name; name= dropbox_active(C, &win->handlers, drag, event); if(name) return name; @@ -218,7 +220,7 @@ static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event) strcpy(drag->opname, "Paste name"); } else { - char *opname= wm_dropbox_active(C, drag, event); + const char *opname= wm_dropbox_active(C, drag, event); if(opname) { BLI_strncpy(drag->opname, opname, FILE_MAX); @@ -256,7 +258,7 @@ static void wm_drop_operator_draw(char *name, int x, int y) UI_DrawString(x+4, y+4, name); } -static char *wm_drag_name(wmDrag *drag) +static const char *wm_drag_name(wmDrag *drag) { switch(drag->type) { case WM_DRAG_ID: |