Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for Pro4

Browse Source
This commit is contained in:
pinkerton%netscape.com 1998-09-29 17:21:32 +00:00
parent 40a762eead
commit fe2c4bdda5
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/macfe/Composer/CEditView.cp
View File

@ -170,8 +170,7 @@ CComposerAwareURLDragMixin :: CComposerAwareURLDragMixin ( )
//
void
CComposerAwareURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAttributes inDragAttrs,
ItemReference inItemRef, Rect & inItemBounds,
SPoint32 & inMouseLoc )
ItemReference inItemRef, Rect & inItemBounds )
{
try
{
@ -194,10 +193,15 @@ CComposerAwareURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAtt
ThrowIfOSErr_( err );
vector<char> datap ( theDataSize + 1 );
if ( noErr == ::GetFlavorData( inDragRef, inItemRef, emComposerNativeDrag, datap.begin(), &theDataSize, 0 )
if ( noErr == ::GetFlavorData( inDragRef, inItemRef, emComposerNativeDrag, &(*datap.begin()), &theDataSize, 0 )
&& ( theDataSize > 0 ) ) {
datap[ theDataSize ] = 0;
HandleDropOfComposerFlavor ( datap.begin(), doCopy, inMouseLoc );
// get where the mouse is for the drag and convert it to local coords.
Point mouseLoc;
::GetDragMouse( inDragRef, &mouseLoc, NULL );
::GlobalToLocal( &mouseLoc );
HandleDropOfComposerFlavor ( &(*datap.begin()), doCopy, mouseLoc );
}
}
break;
@ -3039,13 +3043,13 @@ CEditView::ReceiveDragItem ( DragReference inDragRef, DragAttributes inDragAttr,
FocusDraw();
// store this away for later, it may be necessary
Point mouseLoc;
::GetDragMouse( inDragRef, &mouseLoc, NULL );
::GlobalToLocal( &mouseLoc );
LocalToImagePoint( mouseLoc, mDropLocationImageCoords );
CComposerAwareURLDragMixin::ReceiveDragItem ( inDragRef, inDragAttr, inItemRef, inItemBounds,
mDropLocationImageCoords );
CComposerAwareURLDragMixin::ReceiveDragItem ( inDragRef, inDragAttr, inItemRef, inItemBounds );
} // ReceiveDragItem
@ -3053,17 +3057,19 @@ CEditView::ReceiveDragItem ( DragReference inDragRef, DragAttributes inDragAttr,
//
// HandleDropOfComposerFlavor
//
// Put the data in the right place, given the current mouse location and if this is a copy
// Put the data in the right place, given the current mouse location (in local coords) and if this is a copy
// or a move. Will delete the current selection if it is a move.
//
void
CEditView :: HandleDropOfComposerFlavor ( const char* inData, bool inDoCopy, SPoint32 & inMouseLoc )
CEditView :: HandleDropOfComposerFlavor ( const char* inData, bool inDoCopy, const Point & inMouseLocLocal )
{
SPoint32 mouseInImageCoords;
LocalToImagePoint( inMouseLocLocal, mouseInImageCoords );
EDT_BeginBatchChanges( *GetContext() );
if ( inDoCopy || mDragData == NULL )
EDT_PositionCaret( *GetContext(), inMouseLoc.h, inMouseLoc.v );
EDT_PositionCaret( *GetContext(), mouseInImageCoords.h, mouseInImageCoords.v );
else
EDT_DeleteSelectionAndPositionCaret( *GetContext(), inMouseLoc.h, inMouseLoc.v );
EDT_DeleteSelectionAndPositionCaret( *GetContext(), mouseInImageCoords.h, mouseInImageCoords.v );
EDT_PasteHTML( *GetContext(), const_cast<char*>(inData), ED_PASTE_NORMAL );
EDT_EndBatchChanges( *GetContext() );
@ -4980,7 +4986,7 @@ Boolean CEditView::ObeyCommand( CommandT inCommand, void *ioParam )
}
Boolean CEditView::SetDefaultCSID(Int16 prefCSID)
Boolean CEditView::SetDefaultCSID(Int16 prefCSID, Boolean forceRepaginate /* = false */)
{
int oldCSID = mContext->GetDefaultCSID();

9
cmd/macfe/Composer/CEditView.h
View File

@ -46,11 +46,10 @@ protected:
// overridden to handle composer flavor drops
virtual void ReceiveDragItem ( DragReference inDragRef, DragAttributes inDragAttrs,
ItemReference inItemRef, Rect & inItemBounds,
SPoint32 & inMouse ) ;
ItemReference inItemRef, Rect & inItemBounds ) ;
// must override to do the right thing
virtual void HandleDropOfComposerFlavor ( const char* inData, bool inDoCopy, SPoint32 & inMouse ) = 0 ;
virtual void HandleDropOfComposerFlavor ( const char* inData, bool inDoCopy, const Point & inMouseLocal ) = 0 ;
}; // class CComposerAwareURLDragMixin
@ -154,7 +153,7 @@ public:
virtual Boolean ClickTrackSelection( const SMouseDownEvent& inMouseDown,
CHTMLClickRecord& inClickRecord );
virtual Boolean SetDefaultCSID( Int16 inPreferredCSID );
virtual Boolean SetDefaultCSID( Int16 inPreferredCSID, Boolean forceRepaginate = false );
CBrowserContext *GetNSContext() { return mContext; };
void SetHoldUpdates(HoldUpdatesProxy* inHoldUpdates) {mHoldUpdates = inHoldUpdates;};
@ -219,7 +218,7 @@ protected:
virtual void InsideDropArea( DragReference inDragRef );
virtual void EnterDropArea( DragReference inDragRef, Boolean inDragHasLeftSender );
virtual void HandleDropOfComposerFlavor ( const char* inData, bool inDoCopy,
SPoint32 & inMouse ) ;
const Point & inMouseLocal ) ;
virtual void HandleDropOfPageProxy ( const char* inURL, const char* inTitle ) ;
virtual void HandleDropOfLocalFile ( const char* inFileURL, const char* fileName,
const HFSFlavor & inFileData ) ;