diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 05:15:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 05:15:59 +0400 |
| commit | c77179a3c25b349e8686cdbfe8603e4d03ee2ed3 (patch) | |
| tree | e8228841434f62c2758535790840a81b1f670f40 /source/blender/windowmanager | |
| parent | 1ab7a6f9af2fa0124fafee84d96099de9ec051e3 (diff) | |
code cleanup: comment/remove unused defines
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/WM_api.h | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 13 | ||||
| -rw-r--r-- | source/blender/windowmanager/wm_subwindow.h | 2 |
3 files changed, 6 insertions, 13 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 4e485ebfd63..189c30b02e8 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -99,10 +99,10 @@ struct wmWindow *WM_window_open (struct bContext *C, struct rcti *rect); int WM_window_pixels_x (struct wmWindow *win); int WM_window_pixels_y (struct wmWindow *win); - /* defines for 'type' WM_window_open_temp */ +/* defines for 'type' WM_window_open_temp */ #define WM_WINDOW_RENDER 0 #define WM_WINDOW_USERPREFS 1 -#define WM_WINDOW_FILESEL 2 +// #define WM_WINDOW_FILESEL 2 // UNUSED void WM_window_open_temp (struct bContext *C, struct rcti *position, int type); diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index e4e529ace71..b9350ca8799 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -788,24 +788,19 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) return 1; } -static void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey, int start_maximized) +static void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey) { - GHOST_TWindowState inital_state; GHOST_TUns32 scr_w, scr_h; GHOST_GetMainDisplayDimensions(g_WS.ghost_system, &scr_w, &scr_h); posy = (scr_h - posy - sizey); - if (start_maximized == G_WINDOWSTATE_FULLSCREEN) - inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal; - else - inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal; - g_WS.ghost_window = GHOST_CreateWindow(g_WS.ghost_system, title, posx, posy, sizex, sizey, - inital_state, + /* could optionally start fullscreen */ + GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, FALSE /* no stereo */, FALSE); } @@ -971,7 +966,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) g_WS.ghost_system = GHOST_CreateSystem(); GHOST_AddEventConsumer(g_WS.ghost_system, consumer); - playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y, 0); + playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y); /* unified matrix, note it affects offset for drawing */ glMatrixMode(GL_PROJECTION); diff --git a/source/blender/windowmanager/wm_subwindow.h b/source/blender/windowmanager/wm_subwindow.h index b584d0127a5..064d00b0723 100644 --- a/source/blender/windowmanager/wm_subwindow.h +++ b/source/blender/windowmanager/wm_subwindow.h @@ -34,8 +34,6 @@ /* *************** internal api ************** */ -#define WM_MAXSUBWIN 256 - void wm_subwindows_free(wmWindow *win); int wm_subwindow_open(wmWindow *win, rcti *winrct); |