From 8f30227e23d34d991938190dc0dd80fb55d5206d Mon Sep 17 00:00:00 2001
From: rti <devnull@localhost>
Date: Tue, 6 Jul 2010 20:31:30 +0200
Subject: [PATCH] Fixed: #1009 Cocoa Window not necessary

---
 .../src/3d/driver/opengl/mac/cocoa_adapter.mm |  3 +-
 .../src/3d/driver/opengl/mac/cocoa_window.h   | 31 -------------
 .../src/3d/driver/opengl/mac/cocoa_window.m   | 43 -------------------
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 code/nel/src/3d/driver/opengl/mac/cocoa_window.h
 delete mode 100644 code/nel/src/3d/driver/opengl/mac/cocoa_window.m

diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_adapter.mm b/code/nel/src/3d/driver/opengl/mac/cocoa_adapter.mm
index b3e54cd36..4aa442d22 100644
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_adapter.mm
+++ b/code/nel/src/3d/driver/opengl/mac/cocoa_adapter.mm
@@ -24,7 +24,6 @@
 
 #include "cocoa_event_emitter.h"
 #include "cocoa_opengl_view.h"
-#include "cocoa_window.h"
 
 // Virtual key codes are only defined here. We still do not need to link carbon.
 // see: http://lists.apple.com/archives/Cocoa-dev/2009/May/msg01180.html
@@ -139,7 +138,7 @@ nlWindow createWindow(const GfxMode& mode)
 		NSMiniaturizableWindowMask | NSResizableWindowMask;
 
 	// create a cocoa window with the size provided by the mode parameter
-	CocoaWindow* window = [[CocoaWindow alloc]
+	NSWindow* window = [[NSWindow alloc]
 		initWithContentRect:NSMakeRect(0, 0, mode.Width, mode.Height)
 		styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
 
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window.h b/code/nel/src/3d/driver/opengl/mac/cocoa_window.h
deleted file mode 100644
index 0674a9070..000000000
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_window.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-/**
- * derived to configure the NSWindow
- */
-@interface CocoaWindow : NSWindow
-{
-}
--(BOOL)canBecomeKeyWindow;
--(BOOL)canBecomeMainWindow;
--(BOOL)needsPanelToBecomeKey;
--(BOOL)acceptsFirstResponder;
-@end
diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window.m b/code/nel/src/3d/driver/opengl/mac/cocoa_window.m
deleted file mode 100644
index 3f5f3266c..000000000
--- a/code/nel/src/3d/driver/opengl/mac/cocoa_window.m
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#import "cocoa_window.h"
-
-@implementation CocoaWindow
-
--(BOOL)canBecomeKeyWindow
-{
-	return YES;
-}
-
--(BOOL)canBecomeMainWindow
-{
-	return YES;
-}
-
--(BOOL)needsPanelToBecomeKey
-{
-	return NO;
-}
-
--(BOOL)acceptsFirstResponder
-{
-	return YES;
-}
-
-@end