Big change set:

- LLAppDelegate header relocated to LLWindow.  Definition is still present in secondlife-bin (for compatibility reasons when loading a nib).
- Return key handling fixed.
- Command key now acts the same as the control key by issuing control character codes when the command key is pressed.
- We now retrieve the window pointer directly from the app delegate in LLWindow.

6 files changed, 6 insertions, 69 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 73f5ecc38c..c60940f93c 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1231,10 +1231,9 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
 
 if (DARWIN)
   LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp)
-  LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.h)
-  LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm)
-  LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-delegate.h)
-  LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-delegate.mm)
+
+  # This should be compiled with the viewer.
+  LIST(APPEND viewer_SOURCE_FILES llappdelegate-objc.mm)
 
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
@@ -1532,6 +1531,7 @@ if (FMOD)
   if (DARWIN)
     set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
     add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
+    find_library(CARBON_LIBRARY Carbon)
     set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
     set_target_properties(
       fmodwrapper
diff --git a/indra/newview/llappviewermacosx-delegate.mm b/indra/newview/llappdelegate-objc.mm
index 7baeeb1de8..f5143d7578 100644
--- a/indra/newview/llappviewermacosx-delegate.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -6,7 +6,7 @@
 //
 //
 
-#import "llappviewermacosx-delegate.h"
+#import "llappdelegate-objc.h"
 
 @implementation LLAppDelegate
 
@@ -21,8 +21,6 @@
 {
 	frameTimer = nil;
 	
-	setLLNSWindowRef([self window]);
-	
 	if (initViewer())
 	{
 		frameTimer = [NSTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(mainLoop) userInfo:nil repeats:YES];
diff --git a/indra/newview/llappviewermacosx-delegate.h b/indra/newview/llappviewermacosx-delegate.h
deleted file mode 100644
index 848ccbde62..0000000000
--- a/indra/newview/llappviewermacosx-delegate.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  LLAppDelegate.h
-//  SecondLife
-//
-//  Created by Geenz on 12/16/12.
-//
-//
-
-#import <Cocoa/Cocoa.h>
-#import "llopenglview-objc.h"
-#include "llappviewermacosx-objc.h"
-
-@interface LLAppDelegate : NSObject <NSApplicationDelegate> {
-	LLNSWindow *window;
-	NSTimer *frameTimer;
-}
-
-@property (assign) IBOutlet LLNSWindow *window;
-
-- (void) mainLoop;
-
-@end
diff --git a/indra/newview/llappviewermacosx-objc.h b/indra/newview/llappviewermacosx-objc.h
deleted file mode 100644
index ed9017ca5d..0000000000
--- a/indra/newview/llappviewermacosx-objc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  NSObject_llappviewermacosx_objc.h
-//  SecondLife
-//
-//  Created by Geenz on 12/16/12.
-//
-//
-
-#include <boost/tr1/functional.hpp>
-typedef std::tr1::function<void()> VoidCallback;
-typedef void* ViewerAppRef;
-
-int createNSApp(int argc, const char **argv);
-
-bool initViewer();
-void handleQuit();
-bool runMainLoop();
-void initMainLoop();
-void cleanupViewer();
\ No newline at end of file
diff --git a/indra/newview/llappviewermacosx-objc.mm b/indra/newview/llappviewermacosx-objc.mm
deleted file mode 100644
index ca2090b790..0000000000
--- a/indra/newview/llappviewermacosx-objc.mm
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  llappviewermacosx.m
-//  SecondLife
-//
-//  Created by Geenz on 12/12/12.
-//
-//
-
-#import <Cocoa/Cocoa.h>
-#import <ApplicationServices/ApplicationServices.h>
-#include "llappviewermacosx-objc.h"
-#import "llappviewermacosx-delegate.h"
-
-int createNSApp(int argc, const char *argv[])
-{
-	return NSApplicationMain(argc, argv);
-}
-
-
-
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 6e7b91347b..b199405a66 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -31,7 +31,7 @@
 #endif
 
 #include "llappviewermacosx.h"
-#include "llappviewermacosx-objc.h"
+#include "llwindowmacosx-objc.h"
 #include "llcommandlineparser.h"
 
 #include "llmemtype.h"