Attached Files | vtk diff.txt [^] (4,229 bytes) 1969-12-31 19:00 [Show Content] [Hide Content]banshee:~/kitware/VTK sean$ cvs diff
? .DS_Store
? Testing
? Common/.DS_Store
? Examples/GUI/Win32/vtkMFC/vtkDLG/res/.DS_Store
? Examples/GUI/Win32/vtkMFC/vtkMDI/res/.DS_Store
? Examples/GUI/Win32/vtkMFC/vtkSDI/res/.DS_Store
? Utilities/.DS_Store
? Utilities/Doxygen/.DS_Store
? Utilities/vtkfreetype/.DS_Store
? Utilities/vtkfreetype/src/.DS_Store
? Utilities/vtkfreetype/src/base/.DS_Store
? Utilities/vtkpng/.DS_Store
Index: Rendering/vtkCocoaRenderWindow.mm
===================================================================
RCS file: /cvsroot/VTK/VTK/Rendering/vtkCocoaRenderWindow.mm,v
retrieving revision 1.33
diff -u -3 -p -r1.33 vtkCocoaRenderWindow.mm
--- Rendering/vtkCocoaRenderWindow.mm 31 Mar 2006 21:05:36 -0000 1.33
+++ Rendering/vtkCocoaRenderWindow.mm 20 Jul 2006 21:44:17 -0000
@@ -18,7 +18,6 @@
#import "vtkIdList.h"
#import "vtkObjectFactory.h"
#import "vtkRendererCollection.h"
-#import "vtkCocoaWindow.h"
#import "vtkCocoaGLView.h"
#ifndef MAC_OS_X_VERSION_10_4
@@ -464,7 +463,7 @@ void vtkCocoaRenderWindow::WindowInitial
(float)this->Size[0],
(float)this->Size[1]);
- vtkCocoaWindow* theWindow = [[vtkCocoaWindow alloc]
+ NSWindow* theWindow = [[NSWindow alloc]
initWithContentRect:ctRect
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask
backing:NSBackingStoreBuffered
Index: Rendering/vtkCocoaWindow.h
===================================================================
RCS file: /cvsroot/VTK/VTK/Rendering/vtkCocoaWindow.h,v
retrieving revision 1.8
diff -u -3 -p -r1.8 vtkCocoaWindow.h
--- Rendering/vtkCocoaWindow.h 12 Aug 2005 21:16:00 -0000 1.8
+++ Rendering/vtkCocoaWindow.h 20 Jul 2006 21:44:17 -0000
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: $RCSfile: vtkCocoaWindow.h,v $
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtkCocoaWindow - Access Cocoa NSWindow context
-//
-// .SECTION Description
-// This class is a subclass of Cocoa's NSWindow; it uses Objective-C++.
-// A vtkCocoaWindow is created automatically by vtk by default, but the
-// programmer can override this behaviour. See vtkCocoaRenderWindow's
-// SetWindowId() and WindowInitialize().
-// Note that this class previously contained much more functionality
-// but that functionality has been moved to other classes.
-
-// .SECTION See Also
-// vtkCocoaGLView vtkCocoaRenderWindow
-
-#import <Cocoa/Cocoa.h>
-
-@interface vtkCocoaWindow : NSWindow
-{
-}
-
-@end
Index: Rendering/vtkCocoaWindow.mm
===================================================================
RCS file: /cvsroot/VTK/VTK/Rendering/vtkCocoaWindow.mm,v
retrieving revision 1.6
diff -u -3 -p -r1.6 vtkCocoaWindow.mm
--- Rendering/vtkCocoaWindow.mm 12 Aug 2005 21:16:00 -0000 1.6
+++ Rendering/vtkCocoaWindow.mm 20 Jul 2006 21:44:17 -0000
@@ -1,26 +0,0 @@
-/*=========================================================================
-
- Program: Visualization Toolkit
- Module: $RCSfile: vtkCocoaWindow.mm,v $
-
- Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
- All rights reserved.
- See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notice for more information.
-
-=========================================================================*/
-
-#import "vtkCocoaWindow.h"
-
-@implementation vtkCocoaWindow
-
-//----------------------------------------------------------------------------
-- (void)close
-{
- [super close];
-}
-
-@end
|