From 78d8a1417467a27986b8f63d1aed2f27560a6acd Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 5 Nov 2013 15:37:59 +0000 Subject: OSX: complety remove the cocoa options, definitions and conditionals now --- source/blender/quicktime/SConscript | 7 ++---- source/blender/quicktime/apple/quicktime_export.c | 4 +-- source/blender/windowmanager/intern/wm_window.c | 30 +++++------------------ 3 files changed, 10 insertions(+), 31 deletions(-) (limited to 'source') diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index a6debf06226..7d726ed7c7a 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -58,8 +58,5 @@ priorities = [200,235] defs=['WITH_QUICKTIME'] -if env['WITH_GHOST_COCOA']: - defs.append('GHOST_COCOA') - env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet -else: - env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities) +env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet + diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 52ef21e4f39..67be8b169c6 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -890,7 +890,7 @@ static int ED_operator_setqtcodec(bContext *C) return G.have_quicktime != FALSE; } -#if defined(__APPLE__) && defined(GHOST_COCOA) +#if defined(__APPLE__) /* Need to set up a Cocoa NSAutoReleasePool to avoid memory leak * And it must be done in an objC file, so use a GHOST_SystemCocoa.mm function for that */ extern int cocoa_request_qtcodec_settings_exec(bContext *C, wmOperator *op); @@ -910,7 +910,7 @@ void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot) ot->idname = "SCENE_OT_render_data_set_quicktime_codec"; /* api callbacks */ -#if defined(__APPLE__) && defined(GHOST_COCOA) +#if defined(__APPLE__) ot->exec = cocoa_request_qtcodec_settings_exec; #else ot->exec = request_qtcodec_settings_exec; diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 9e89c17e024..5f344340643 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -133,10 +133,6 @@ static void wm_window_check_position(rcti *rect) wm_get_screensize(&width, &height); -#if defined(__APPLE__) && !defined(GHOST_COCOA) - height -= 70; -#endif - if (rect->xmin < 0) { rect->xmax -= rect->xmin; rect->xmin = 0; @@ -338,12 +334,6 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win) * in case of OS application terminate request (e.g. OS Shortcut Alt+F4, Cmd+Q, (...), or session end) */ GHOST_SetWindowModifiedState(win->ghostwin, (GHOST_TUns8) !wm->file_saved); -#if defined(__APPLE__) && !defined(GHOST_COCOA) - if (wm->file_saved) - GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateUnModified); - else - GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateModified); -#endif } } @@ -428,20 +418,12 @@ void wm_window_add_ghostwindows(wmWindowManager *wm) if (wm_init_state.size_x == 0) { wm_get_screensize(&wm_init_state.size_x, &wm_init_state.size_y); -#if defined(__APPLE__) && !defined(GHOST_COCOA) - /* Cocoa provides functions to get correct max window size */ - { - extern void wm_set_apple_prefsize(int, int); /* wm_apple.c */ - - wm_set_apple_prefsize(wm_init_state.size_x, wm_init_state.size_y); - } -#else - /* note!, this isnt quite correct, active screen maybe offset 1000s if PX, - * we'd need a wm_get_screensize like function that gives offset, - * in practice the window manager will likely move to the correct monitor */ - wm_init_state.start_x = 0; - wm_init_state.start_y = 0; -#endif + /* note!, this isnt quite correct, active screen maybe offset 1000s if PX, + * we'd need a wm_get_screensize like function that gives offset, + * in practice the window manager will likely move to the correct monitor */ + wm_init_state.start_x = 0; + wm_init_state.start_y = 0; + #if !defined(__APPLE__) && !defined(WIN32) /* X11 */ /* X11, start maximized but use default sane size */ -- cgit v1.2.3