diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-06-08 22:55:49 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-06-08 22:55:49 +0400 |
| commit | 205b6501a0ad8e792d2d7cc32dc3ba25b7613ec2 (patch) | |
| tree | c82cd64d5849e161f738334606fc676d33a2ffa5 /intern/ghost | |
| parent | ce68fddc0db812dd827ffd2d8bf90fb0badcb90e (diff) | |
(Accidentally sent previous commit without message... is same stuff)
gcc4 error fixes for compiling in OSX Tiger
Also; make using python framework default in makefiles
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCarbon.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index ad19f08c950..bd271fd0c8d 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -115,8 +115,14 @@ GHOST_WindowCarbon::GHOST_WindowCarbon( //fprintf(stderr," main screen top %i left %i height %i width %i\n", top, left, height, width); - if (state >= 8 ) { - state = state - 8; + if (state >= GHOST_kWindowState8Normal ) { + if(state == GHOST_kWindowState8Normal) state= GHOST_kWindowStateNormal; + else if(state == GHOST_kWindowState8Maximized) state= GHOST_kWindowStateMaximized; + else if(state == GHOST_kWindowState8Minimized) state= GHOST_kWindowStateMinimized; + else if(state == GHOST_kWindowState8FullScreen) state= GHOST_kWindowStateFullScreen; + + // state = state - 8; this was the simple version of above code, doesnt work in gcc 4.0 + setMac_windowState(1); } else setMac_windowState(0); |