diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-12-05 10:26:03 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-05 10:26:03 +0400 |
commit | 6976866d5ada2bd25216c84cb6f6f6fa2aa7aea5 (patch) | |
tree | dff5a6b983252bddf30f24ddda5d6f71c209f8b4 /source/blender/windowmanager | |
parent | 8003f0606d934be957981415fabd6401e9a99fcb (diff) |
User Interface: Ctrl+C over a menu copies the py command
also use bools rather then ints
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 18 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 8 |
6 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 2402b8d61b9..26294dd5876 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -75,7 +75,7 @@ void WM_init_state_normal_set(void); void WM_init_native_pixels(bool do_it); void WM_init (struct bContext *C, int argc, const char **argv); -void WM_exit_ext (struct bContext *C, const short do_python); +void WM_exit_ext (struct bContext *C, const bool do_python); void WM_exit (struct bContext *C) ATTR_NORETURN; @@ -164,7 +164,7 @@ struct wmEventHandler *WM_event_add_dropbox_handler(ListBase *handlers, ListBase /* mouse */ void WM_event_add_mousemove(struct bContext *C); -int WM_modal_tweak_exit(const struct wmEvent *event, int tweak_event); +bool WM_modal_tweak_exit(const struct wmEvent *event, int tweak_event); /* notifiers */ void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference); @@ -182,7 +182,7 @@ void wm_event_init_from_window(struct wmWindow *win, struct wmEvent *event); /* at maximum, every timestep seconds it triggers event_type events */ struct wmTimer *WM_event_add_timer(struct wmWindowManager *wm, struct wmWindow *win, int event_type, double timestep); void WM_event_remove_timer(struct wmWindowManager *wm, struct wmWindow *win, struct wmTimer *timer); -void WM_event_timer_sleep(struct wmWindowManager *wm, struct wmWindow *win, struct wmTimer *timer, int dosleep); +void WM_event_timer_sleep(struct wmWindowManager *wm, struct wmWindow *win, struct wmTimer *timer, bool do_sleep); /* operator api, default callbacks */ /* invoke callback, uses enum property named "type" */ @@ -379,13 +379,13 @@ enum { struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void *owner, const char *name, int flag, int job_type); -int WM_jobs_test(struct wmWindowManager *wm, void *owner, int job_type); +bool WM_jobs_test(struct wmWindowManager *wm, void *owner, int job_type); float WM_jobs_progress(struct wmWindowManager *wm, void *owner); char *WM_jobs_name(struct wmWindowManager *wm, void *owner); void *WM_jobs_customdata(struct wmWindowManager *wm, void *owner); void *WM_jobs_customdata_from_type(struct wmWindowManager *wm, int job_type); -int WM_jobs_is_running(struct wmJob *); +bool WM_jobs_is_running(struct wmJob *); void *WM_jobs_customdata_get(struct wmJob *); void WM_jobs_customdata_set(struct wmJob *, void *customdata, void (*free)(void *)); void WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote); @@ -402,14 +402,14 @@ void WM_jobs_kill_all(struct wmWindowManager *wm); void WM_jobs_kill_all_except(struct wmWindowManager *wm, void *owner); void WM_jobs_kill_type(struct wmWindowManager *wm, void *owner, int job_type); -int WM_jobs_has_running(struct wmWindowManager *wm); +bool WM_jobs_has_running(struct wmWindowManager *wm); void WM_job_main_thread_lock_acquire(struct wmJob *job); void WM_job_main_thread_lock_release(struct wmJob *job); /* clipboard */ -char *WM_clipboard_text_get(int selection); -void WM_clipboard_text_set(char *buf, int selection); +char *WM_clipboard_text_get(bool selection); +void WM_clipboard_text_set(const char *buf, bool selection); /* progress */ void WM_progress_set(struct wmWindow *win, float progress); @@ -421,7 +421,7 @@ void WM_redraw_windows(struct bContext *C); void WM_main_playanim(int argc, const char **argv); /* debugging only, convenience function to write on crash */ -int write_crash_blend(void); +bool write_crash_blend(void); #ifdef __cplusplus } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ef1f6c7a34a..8ac8da93584 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2584,7 +2584,7 @@ void WM_event_add_mousemove(bContext *C) /* for modal callbacks, check configuration for how to interpret exit with tweaks */ -int WM_modal_tweak_exit(const wmEvent *event, int tweak_event) +bool WM_modal_tweak_exit(const wmEvent *event, int tweak_event) { /* if the release-confirm userpref setting is enabled, * tweak events can be canceled when mouse is released diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index dfdbe308965..31af7804058 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -832,7 +832,7 @@ static ImBuf *blend_file_thumb(Scene *scene, bScreen *screen, int **thumb_pt) } /* easy access from gdb */ -int write_crash_blend(void) +bool write_crash_blend(void) { char path[FILE_MAX]; int fileflags = G.fileflags & ~(G_FILE_HISTORY); /* don't do file history on crash file */ diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 63aa3ce6811..8b43a6af606 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -382,7 +382,7 @@ static void wait_for_console_key(void) /* called in creator.c even... tsk, split this! */ /* note, doesnt run exit() call WM_exit() for that */ -void WM_exit_ext(bContext *C, const short do_python) +void WM_exit_ext(bContext *C, const bool do_python) { wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL; diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index b3856a2aa9c..7da9a1c09d3 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -222,7 +222,7 @@ wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char * } /* returns true if job runs, for UI (progress) indicators */ -int WM_jobs_test(wmWindowManager *wm, void *owner, int job_type) +bool WM_jobs_test(wmWindowManager *wm, void *owner, int job_type) { wmJob *wm_job; @@ -280,7 +280,7 @@ void *WM_jobs_customdata_from_type(wmWindowManager *wm, int job_type) return NULL; } -int WM_jobs_is_running(wmJob *wm_job) +bool WM_jobs_is_running(wmJob *wm_job) { return wm_job->running; } @@ -649,7 +649,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt) } } -int WM_jobs_has_running(wmWindowManager *wm) +bool WM_jobs_has_running(wmWindowManager *wm) { wmJob *wm_job; diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 5f344340643..d3936ff32e2 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1137,7 +1137,7 @@ void wm_ghost_exit(void) /* **************** timer ********************** */ /* to (de)activate running timers temporary */ -void WM_event_timer_sleep(wmWindowManager *wm, wmWindow *UNUSED(win), wmTimer *timer, int dosleep) +void WM_event_timer_sleep(wmWindowManager *wm, wmWindow *UNUSED(win), wmTimer *timer, bool do_sleep) { wmTimer *wt; @@ -1146,7 +1146,7 @@ void WM_event_timer_sleep(wmWindowManager *wm, wmWindow *UNUSED(win), wmTimer *t break; if (wt) - wt->sleep = dosleep; + wt->sleep = do_sleep; } wmTimer *WM_event_add_timer(wmWindowManager *wm, wmWindow *win, int event_type, double timestep) @@ -1199,7 +1199,7 @@ void WM_event_remove_timer(wmWindowManager *wm, wmWindow *UNUSED(win), wmTimer * /* ******************* clipboard **************** */ -char *WM_clipboard_text_get(int selection) +char *WM_clipboard_text_get(bool selection) { char *p, *p2, *buf, *newbuf; @@ -1224,7 +1224,7 @@ char *WM_clipboard_text_get(int selection) return newbuf; } -void WM_clipboard_text_set(char *buf, int selection) +void WM_clipboard_text_set(const char *buf, bool selection) { if (!G.background) { #ifdef _WIN32 |