diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
| commit | 58d6cbba6da31db8dc8a2b42d528b9a353081904 (patch) | |
| tree | 04b57a2f809c6f08d84a082edf061f3ece631860 /source/blender/windowmanager/wm_window.h | |
| parent | 94549adec4b6857fb6ec4cf77606da51ff7c26b7 (diff) | |
| parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) | |
Merge branch 'master' into temp-ghash-setopstemp-ghash-setops
Diffstat (limited to 'source/blender/windowmanager/wm_window.h')
| -rw-r--r-- | source/blender/windowmanager/wm_window.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 833234b0f13..a104f6aba39 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -32,17 +32,18 @@ #ifndef __WM_WINDOW_H__ #define __WM_WINDOW_H__ -struct bScreen; struct wmOperator; /* *************** internal api ************** */ void wm_ghost_init (bContext *C); void wm_ghost_exit(void); -void wm_get_screensize(int *width_r, int *height_r); -void wm_get_desktopsize(int *width_r, int *height_r); +void wm_get_screensize(int *r_width, int *r_height); +void wm_get_desktopsize(int *r_width, int *r_height); wmWindow *wm_window_new (bContext *C); +wmWindow *wm_window_copy (bContext *C, wmWindow *win_src); +wmWindow *wm_window_copy_test (bContext *C, wmWindow *win_src); void wm_window_free (bContext *C, wmWindowManager *wm, wmWindow *win); void wm_window_close (bContext *C, wmWindowManager *wm, wmWindow *win); @@ -56,7 +57,7 @@ void wm_window_make_drawable(wmWindowManager *wm, wmWindow *win); void wm_window_raise (wmWindow *win); void wm_window_lower (wmWindow *win); void wm_window_set_size (wmWindow *win, int width, int height); -void wm_window_get_position (wmWindow *win, int *posx_r, int *posy_r); +void wm_window_get_position (wmWindow *win, int *r_pos_x, int *r_pos_y); void wm_window_swap_buffers (wmWindow *win); void wm_window_set_swap_interval(wmWindow *win, int interval); bool wm_window_get_swap_interval(wmWindow *win, int *intervalOut); @@ -65,8 +66,6 @@ float wm_window_pixelsize(wmWindow *win); void wm_get_cursor_position (wmWindow *win, int *x, int *y); -wmWindow *wm_window_copy (bContext *C, wmWindow *winorig); - void wm_window_testbreak (void); #ifdef WITH_INPUT_IME |