More things in this commit:

- Removed the callback system in favor of simply defining functions in a header to later be implemented in whichever file is most convenient for what we want to do (i.e., calling LLWindow callbacks within LLWindowMacOSX, setting cursors in llwindowmacosx-objc.mm, etc.)
- Viewer shutdown now works appropriately
- Added a bit of debugging code to test if a key has been handled by the UI or not (useful for tracking down the mystery of the enter key not being handled)
- Setup a cocoa quit handler within the application delegate that intercepts any termination requests

1 files changed, 0 insertions, 30 deletions

diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h
index 6b055bc665..20589e321d 100644
--- a/indra/llwindow/llopenglview-objc.h
+++ b/indra/llwindow/llopenglview-objc.h
@@ -15,7 +15,6 @@
 @interface LLOpenGLView : NSOpenGLView
 {
 	NSPoint mousePos;
-	ResizeCallback mResizeCallback;
 }
 
 - (id) initWithFrame:(NSRect)frame withSamples:(NSUInteger)samples andVsync:(BOOL)vsync;
@@ -33,42 +32,13 @@
 - (CGLContextObj) getCGLContextObj;
 - (CGLPixelFormatObj*)getCGLPixelFormatObj;
 
-- (void) registerResizeCallback:(ResizeCallback)callback;
 @end
 
 @interface LLNSWindow : NSWindow {
 	float mMousePos[2];
 	unsigned int mModifiers;
-	
-	KeyCallback mKeyDownCallback;
-	KeyCallback mKeyUpCallback;
-	UnicodeCallback mUnicodeCallback;
-	ModifierCallback mModifierCallback;
-	MouseCallback mMouseDownCallback;
-	MouseCallback mMouseUpCallback;
-	MouseCallback mMouseDoubleClickCallback;
-	MouseCallback mRightMouseDownCallback;
-	MouseCallback mRightMouseUpCallback;
-	MouseCallback mMouseMovedCallback;
-	ScrollWheelCallback mScrollWhellCallback;
-	VoidCallback mMouseExitCallback;
-	MouseCallback mDeltaUpdateCallback;
 }
 
-- (void) registerKeyDownCallback:(KeyCallback)callback;
-- (void) registerKeyUpCallback:(KeyCallback)callback;
-- (void) registerUnicodeCallback:(UnicodeCallback)callback;
-- (void) registerModifierCallback:(ModifierCallback)callback;
-- (void) registerMouseDownCallback:(MouseCallback)callback;
-- (void) registerMouseUpCallback:(MouseCallback)callback;
-- (void) registerRightMouseDownCallback:(MouseCallback)callback;
-- (void) registerRightMouseUpCallback:(MouseCallback)callback;
-- (void) registerDoubleClickCallback:(MouseCallback)callback;
-- (void) registerMouseMovedCallback:(MouseCallback)callback;
-- (void) registerScrollCallback:(ScrollWheelCallback)callback;
-- (void) registerMouseExitCallback:(VoidCallback)callback;
-- (void) registerDeltaUpdateCallback:(MouseCallback)callback;
-
 @end
 
 void setLLNSWindowRef(LLNSWindow* window);