Attachment #75797 for issue #116131

View | Details | Raw Unified | Return to issue 116131
Collapse All | Expand All

Lines 85-90 Link Here

(-)a/vcl/aqua/inc/salframeview.h (+1 lines)
85	}	85	}
86	+(void)unsetMouseFrame: (AquaSalFrame*)pFrame;	86	+(void)unsetMouseFrame: (AquaSalFrame*)pFrame;
87	-(id)initWithSalFrame: (AquaSalFrame*)pFrame;	87	-(id)initWithSalFrame: (AquaSalFrame*)pFrame;
		88	-(AquaSalFrame*)getSalFrame;
88	-(MacOSBOOL)acceptsFirstResponder;	89	-(MacOSBOOL)acceptsFirstResponder;
89	-(MacOSBOOL)acceptsFirstMouse: (NSEvent *)pEvent;	90	-(MacOSBOOL)acceptsFirstMouse: (NSEvent *)pEvent;
90	-(MacOSBOOL)isOpaque;	91	-(MacOSBOOL)isOpaque;

Lines 50-55 Link Here

(-)a/vcl/aqua/source/dtrans/DropTarget.cxx (-2 / +8 lines)
50	#include <Carbon/Carbon.h>	50	#include <Carbon/Carbon.h>
51	#include <postmac.h>	51	#include <postmac.h>
52		52
		53	#include <salframe.h>
		54	#include <salframeview.h>
53		55
54	using namespace rtl;	56	using namespace rtl;
55	using namespace cppu;	57	using namespace cppu;
Lines 149-154 Link Here
149		151
150	DropTarget::DropTarget() :	152	DropTarget::DropTarget() :
151	WeakComponentImplHelper5<XInitialization, XDropTarget, XDropTargetDragContext, XDropTargetDropContext, XServiceInfo>(m_aMutex),	153	WeakComponentImplHelper5<XInitialization, XDropTarget, XDropTargetDragContext, XDropTargetDropContext, XServiceInfo>(m_aMutex),
		154	mView(nil),
		155	mpFrame(NULL),
152	mDropTargetHelper(nil),	156	mDropTargetHelper(nil),
153	mbActive(false),	157	mbActive(false),
154	mDragSourceSupportedActions(DNDConstants::ACTION_NONE),	158	mDragSourceSupportedActions(DNDConstants::ACTION_NONE),
Lines 161-168 Link Here
161		165
162	DropTarget::~DropTarget()	166	DropTarget::~DropTarget()
163	{	167	{
164	[(id <DraggingDestinationHandler>)mView unregisterDraggingDestinationHandler:mDropTargetHelper];	168	if( AquaSalFrame::isAlive( mpFrame ) )
165	[mDropTargetHelper release];	169	[(id <DraggingDestinationHandler>)mView unregisterDraggingDestinationHandler:mDropTargetHelper];
		170	[mDropTargetHelper release];
166	}	171	}
167		172
168		173
Lines 396-401 Link Here
396	sal_uInt64 tmp = 0;	401	sal_uInt64 tmp = 0;
397	pNSView >>= tmp;	402	pNSView >>= tmp;
398	mView = (id)tmp;	403	mView = (id)tmp;
		404	mpFrame = [(SalFrameView*)mView getSalFrame];
399		405
400	mDropTargetHelper = [[DropTargetHelper alloc] initWithDropTarget: this];	406	mDropTargetHelper = [[DropTargetHelper alloc] initWithDropTarget: this];
401		407

Lines 51-56 Link Here

(-)a/vcl/aqua/source/dtrans/DropTarget.hxx (+2 lines)
51	#include <postmac.h>	51	#include <postmac.h>
52		52
53	class DropTarget;	53	class DropTarget;
		54	class AquaSalFrame;
54		55
55	/* The functions declared in this protocol are actually	56	/* The functions declared in this protocol are actually
56	declared in vcl/aqua/inc/salframe.h. Because we want	57	declared in vcl/aqua/inc/salframe.h. Because we want
Lines 159-164 Link Here
159	com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard;	160	com::sun::star::uno::Reference< com::sun::star::datatransfer::clipboard::XClipboard > mXCurrentDragClipboard;
160	DataFlavorMapperPtr_t mDataFlavorMapper;	161	DataFlavorMapperPtr_t mDataFlavorMapper;
161	id mView;	162	id mView;
		163	AquaSalFrame* mpFrame;
162	DropTargetHelper* mDropTargetHelper;	164	DropTargetHelper* mDropTargetHelper;
163	bool mbActive;	165	bool mbActive;
164	sal_Int8 mDragSourceSupportedActions;	166	sal_Int8 mDragSourceSupportedActions;

Lines 398-403 Link Here

(-)a/vcl/aqua/source/window/salframeview.mm (+5 lines)
398	return self;	398	return self;
399	}	399	}
400		400
		401	-(AquaSalFrame*)getSalFrame
		402	{
		403	return mpFrame;
		404	}
		405
401	-(void)resetCursorRects	406	-(void)resetCursorRects
402	{	407	{
403	if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )	408	if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )

Return to issue 116131