[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33990] trunk/blender/intern/ghost/intern/ GHOST_WindowCocoa.mm: Fix [#25442]: (Ghost Cocoa) Add missing initialization of associated object pointer when switching to/ from fullscreen.
Damien Plisson
damien.plisson at yahoo.fr
Sat Jan 1 20:48:14 CET 2011
Revision: 33990
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33990
Author: damien78
Date: 2011-01-01 20:48:14 +0100 (Sat, 01 Jan 2011)
Log Message:
-----------
Fix [#25442]: (Ghost Cocoa) Add missing initialization of associated object pointer when switching to/from fullscreen.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2011-01-01 17:52:06 UTC (rev 33989)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2011-01-01 19:48:14 UTC (rev 33990)
@@ -143,6 +143,7 @@
GHOST_TDragnDropTypes m_draggedObjectType;
}
- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa;
+- (GHOST_SystemCocoa*)systemCocoa;
@end
@implementation CocoaWindow
- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa
@@ -150,6 +151,10 @@
systemCocoa = sysCocoa;
associatedWindow = winCocoa;
}
+- (GHOST_SystemCocoa*)systemCocoa
+{
+ return systemCocoa;
+}
-(BOOL)canBecomeKeyWindow
{
@@ -777,6 +782,7 @@
[tmpWindow setReleasedWhenClosed:NO];
[tmpWindow setAcceptsMouseMovedEvents:YES];
[tmpWindow setDelegate:[m_window delegate]];
+ [tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this];
[tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
NSStringPboardType, NSTIFFPboardType, nil]];
@@ -837,6 +843,7 @@
[tmpWindow setReleasedWhenClosed:NO];
[tmpWindow setAcceptsMouseMovedEvents:YES];
[tmpWindow setDelegate:[m_window delegate]];
+ [tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this];
[tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
NSStringPboardType, NSTIFFPboardType, nil]];
//Forbid to resize the window below the blender defined minimum one
More information about the Bf-blender-cvs
mailing list