[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23675] branches/soc-2008-mxcurioni: merged changed to revision 23673

Maxime Curioni maxime.curioni at gmail.com
Wed Oct 7 05:47:38 CEST 2009 

Revision: 23675
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23675
Author:   mxcurioni
Date:     2009-10-07 05:47:36 +0200 (Wed, 07 Oct 2009)

Log Message:
-----------
merged changed to revision 23673

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23673

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ops.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
    branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/render/SConscript
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_raytrace.h
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/tools/Blender.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/raycounter.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/rayobject.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_blibvh.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_instance.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_octree.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_raycounter.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/Makefile
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/raytrace.c

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/SConstruct	2009-10-07 03:47:36 UTC (rev 23675)
@@ -578,10 +578,6 @@
 		else:
 			dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
 	if env['WITH_BF_PYTHON']:
-		ver = env["BF_PYTHON_VERSION"].replace(".", "")
-		
-		dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
-		dllsources.append('${LCGDIR}/release/zlib.pyd')
 		if env['BF_DEBUG']:
 			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
 		else:

Modified: branches/soc-2008-mxcurioni/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/win64-vc-config.py	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/config/win64-vc-config.py	2009-10-07 03:47:36 UTC (rev 23675)
@@ -164,7 +164,7 @@
 CFLAGS = []
 CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE2']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 

Modified: branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt	2009-10-07 03:47:36 UTC (rev 23675)
@@ -32,14 +32,12 @@
 	src/BulletCollision/CollisionShapes/*.cpp
 	src/BulletCollision/NarrowPhaseCollision/*.cpp
 	src/BulletCollision/Gimpact/*.cpp
-	src/BulletCollision//CollisionDispatch/*.cpp
+	src/BulletCollision/CollisionDispatch/*.cpp
 	src/BulletDynamics/ConstraintSolver/*.cpp
 	src/BulletDynamics/Vehicle/*.cpp
 	src/BulletDynamics/Dynamics/*.cpp
 	src/BulletSoftBody/*.cpp
 )
 
-ADD_DEFINITIONS(-D_LIB)
-
 BLENDERLIB(extern_bullet "${SRC}" "${INC}")
-#, libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
+

Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript	2009-10-07 03:47:36 UTC (rev 23675)
@@ -4,11 +4,11 @@
 
 Import('env')
 
-defs = 'USE_DOUBLES QHULL _LIB'
+defs = ''
 cflags = []
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    defs += ' WIN32 NDEBUG _WINDOWS _LIB'
+    defs += ' WIN32 NDEBUG _WINDOWS'
     #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
     cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
 elif env['OURPLATFORM']=='win32-mingw':

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h	2009-10-07 03:47:36 UTC (rev 23675)
@@ -598,7 +598,17 @@
 extern GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
 										   GHOST_TWindowState state);
 
+	
 /**
+ * Sets the window "modified" status, indicating unsaved changes
+ * @param windowhandle The handle to the window
+ * @param isUnsavedChanges Unsaved changes or not
+ * @return Indication of success.
+ */
+extern GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
+												   GHOST_TUns8 isUnsavedChanges);
+	
+/**
  * Sets the order of the window (bottom, top).
  * @param windowhandle The handle to the window
  * @param order The order of the window.

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h	2009-10-07 03:47:36 UTC (rev 23675)
@@ -162,6 +162,19 @@
 	virtual GHOST_TSuccess setState(GHOST_TWindowState state) = 0;
 
 	/**
+	 * Sets the window "modified" status, indicating unsaved changes
+	 * @param isUnsavedChanges Unsaved changes or not
+	 * @return Indication of success.
+	 */
+	virtual GHOST_TSuccess setModifiedState(bool isUnsavedChanges) = 0;
+	
+	/**
+	 * Gets the window "modified" status, indicating unsaved changes
+	 * @return True if there are unsaved changes
+	 */
+	virtual bool getModifiedState() = 0;
+	
+	/**
 	 * Sets the order of the window (bottom, top).
 	 * @param order The order of the window.
 	 * @return Indication of success.

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h	2009-10-07 03:47:36 UTC (rev 23675)
@@ -116,7 +116,13 @@
 } GHOST_TWindowState;
 
 
+/** Constants for the answer to the blender exit request */
 typedef enum {
+	GHOST_kExitCancel = 0,
+	GHOST_kExitNow
+} GHOST_TExitRequestResponse;
+
+typedef enum {
 	GHOST_kWindowOrderTop = 0,
 	GHOST_kWindowOrderBottom
 } GHOST_TWindowOrder;

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp	2009-10-07 03:47:36 UTC (rev 23675)
@@ -629,7 +629,14 @@
 }
 
 
+GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle, GHOST_TUns8 isUnsavedChanges)
+{
+	GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+	
+	return window->setModifiedState(isUnsavedChanges);
+}	
 
+
 GHOST_TSuccess GHOST_SetWindowOrder(GHOST_WindowHandle windowhandle,
 									GHOST_TWindowOrder order)
 {

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h	2009-10-07 03:47:36 UTC (rev 23675)
@@ -46,6 +46,7 @@
 class GHOST_EventCursor;
 class GHOST_EventKey;
 class GHOST_EventWindow;
+class GHOST_WindowCocoa;
 
 
 class GHOST_SystemCocoa : public GHOST_System {
@@ -133,6 +134,12 @@
 	 */
 	virtual bool processEvents(bool waitForEvent);
 	
+	/**
+	 * Handle User request to quit, from Menu bar Quit, and Cmd+Q
+	 * Display alert panel if changes performed since last save
+	 */
+	GHOST_TUns8 handleQuitRequest();
+	
 	/***************************************************************************************
 	 ** Cursor management functionality
 	 ***************************************************************************************/
@@ -185,6 +192,13 @@
 	 */
 	virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const;
 
+	/**
+     * Handles a window event. Called by GHOST_WindowCocoa window delegate
+     * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
+     * @return Indication whether the event was handled. 
+     */
+    GHOST_TSuccess handleWindowEvent(GHOST_TEventType eventType, GHOST_WindowCocoa* window);
+	
 protected:
 	/**
 	 * Initializes the system.
@@ -193,40 +207,27 @@
 	 */
 	virtual GHOST_TSuccess init();
 
-	/**
-	 * Closes the system down.
-	 * @return A success value.
-	 */
-	virtual GHOST_TSuccess exit();
-
-	
     /**
      * Handles a tablet event.
      * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
      * @return Indication whether the event was handled. 
      */
-    int handleTabletEvent(void *eventPtr);
-    /**
+    GHOST_TSuccess handleTabletEvent(void *eventPtr);
+    
+	/**
      * Handles a mouse event.
      * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
      * @return Indication whether the event was handled. 
      */
-    int handleMouseEvent(void *eventPtr);
+    GHOST_TSuccess handleMouseEvent(void *eventPtr);
 
     /**
      * Handles a key event.
      * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
      * @return Indication whether the event was handled. 
      */
-    int handleKeyEvent(void *eventPtr);
+    GHOST_TSuccess handleKeyEvent(void *eventPtr);
 
-   /**
-     * Handles a window event.
-     * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
-     * @return Indication whether the event was handled. 
-     */
-    int handleWindowEvent(void *eventPtr);
-
     /**
      * Handles all basic Mac application stuff for a mouse down event.
      * @param eventPtr	An NSEvent pointer (casted to void* to enable compilation in standard C++)
@@ -250,10 +251,7 @@
      * @param tmTask Pointer to the timer task that expired.
      */
     //static void s_timerCallback(TMTaskPtr tmTask);
-    
-	/** Cocoa autoReleasePool (void*) used for enablign standard C++ compilation */
-	void* m_autoReleasePool;
-	
+    	
     /** Event handler reference. */
     //EventHandlerRef m_handler;
 	

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-10-07 00:14:23 UTC (rev 23674)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-10-07 03:47:36 UTC (rev 23675)
@@ -89,7 +89,157 @@
 	
 };*/
 
-static GHOST_TButtonMask convertButton(EventMouseButton button)
+/* Keycodes from Carbon include file */
+/*  
+ *  Summary:
+ *    Virtual keycodes
+ *  
+ *  Discussion:
+ *    These constants are the virtual keycodes defined originally in
+ *    Inside Mac Volume V, pg. V-191. They identify physical keys on a
+ *    keyboard. Those constants with "ANSI" in the name are labeled
+ *    according to the key position on an ANSI-standard US keyboard.
+ *    For example, kVK_ANSI_A indicates the virtual keycode for the key

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list