X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c5a378ff21de766bab2fd76293be1008610afc2..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/cocoa/NSView.h diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h index e59dfdbbd2..9cea1d678a 100644 --- a/include/wx/cocoa/NSView.h +++ b/include/wx/cocoa/NSView.h @@ -15,7 +15,12 @@ #include "wx/hashmap.h" #include "wx/cocoa/ObjcAssociate.h" +#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) +typedef struct CGRect NSRect; +#else typedef struct _NSRect NSRect; +#endif + class wxWindow; WX_DECLARE_OBJC_HASHMAP(NSView); @@ -33,39 +38,39 @@ public: { return NULL; } virtual void Cocoa_FrameChanged(void) = 0; virtual void Cocoa_synthesizeMouseMoved(void) = 0; - virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent) + virtual bool Cocoa_acceptsFirstMouse(bool &WXUNUSED(acceptsFirstMouse), WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_drawRect(const NSRect &rect) + virtual bool Cocoa_drawRect(const NSRect &WXUNUSED(rect)) { return false; } - virtual bool Cocoa_mouseDown(WX_NSEvent theEvent) + virtual bool Cocoa_mouseDown(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent) + virtual bool Cocoa_mouseDragged(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_mouseUp(WX_NSEvent theEvent) + virtual bool Cocoa_mouseUp(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent) + virtual bool Cocoa_mouseMoved(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent) + virtual bool Cocoa_mouseEntered(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_mouseExited(WX_NSEvent theEvent) + virtual bool Cocoa_mouseExited(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent) + virtual bool Cocoa_rightMouseDown(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent) + virtual bool Cocoa_rightMouseDragged(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent) + virtual bool Cocoa_rightMouseUp(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent) + virtual bool Cocoa_otherMouseDown(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent) + virtual bool Cocoa_otherMouseDragged(WX_NSEvent WXUNUSED(theEvent)) { return false; } - virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent) + virtual bool Cocoa_otherMouseUp(WX_NSEvent WXUNUSED(theEvent)) { return false; } virtual bool Cocoa_resetCursorRects() { return false; } virtual bool Cocoa_viewDidMoveToWindow() { return false; } - virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow) + virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow)) { return false; } virtual ~wxCocoaNSView() { } };