Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 192611: nsIFrameSelection has a data member. r/sr=dbaron

Browse Source
This commit is contained in:
sfraser%netscape.com 2003-04-03 22:32:50 +00:00
parent cde8938427
commit 55a823d10e
4 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
content/base/src/nsSelection.cpp
View File

@ -446,9 +446,14 @@ private:
nsPeekOffsetStruct aPos);
#endif // VISUALSELECTION
//post and pop reasons for notifications. we may stack these later
void PostReason(short aReason){mReason = aReason;}
short PopReason(){short retval = mReason; mReason=0;return retval;}
// post and pop reasons for notifications. we may stack these later
void PostReason(PRInt16 aReason) { mSelectionChangeReason = aReason; }
PRInt16 PopReason()
{
PRInt16 retval = mSelectionChangeReason;
mSelectionChangeReason = 0;
return retval;
}
friend class nsTypedSelection;
#ifdef DEBUG
@ -510,13 +515,20 @@ private:
nsIContent *mLimiter; //limit selection navigation to a child of this node.
nsIFocusTracker *mTracker;
PRInt16 mSelectionChangeReason; // reason for notifications of selection changing
PRInt16 mDisplaySelection; //for visual display purposes.
HINT mHint; //hint to tell if the selection is at the end of this line or beginning of next
PRInt32 mDesiredX;
nsIScrollableView *mScrollView;
PRBool mDelayCaretOverExistingSelection;
PRBool mDelayedMouseEventValid;
nsMouseEvent mDelayedMouseEvent;
PRPackedBool mDelayCaretOverExistingSelection;
PRPackedBool mDelayedMouseEventValid;
PRPackedBool mChangesDuringBatching;
PRPackedBool mNotifyFrames;
PRPackedBool mIsEditor;
@ -524,7 +536,6 @@ private:
PRPackedBool mMouseDownState; //for drag purposes
PRPackedBool mMouseDoubleDownState; //has the doubleclick down happened
PRPackedBool mDesiredXSet;
short mReason; //reason for notifications of selection changing
};
class nsSelectionIterator : public nsIBidirectionalEnumerator
@ -986,11 +997,10 @@ nsSelection::nsSelection()
mDelayCaretOverExistingSelection = PR_TRUE;
mDelayedMouseEventValid = PR_FALSE;
mReason = nsISelectionListener::NO_REASON;
mSelectionChangeReason = nsISelectionListener::NO_REASON;
}
nsSelection::~nsSelection()
{
PRInt32 i;
@ -2918,7 +2928,7 @@ nsSelection::SetMouseDownState(PRBool aState)
mMouseDownState = aState;
if (!mMouseDownState)
{
short reason;
PRInt16 reason;
if (aState)
reason = nsISelectionListener::MOUSEDOWN_REASON;
else

2
layout/base/nsIFrameSelection.h
View File

@ -132,7 +132,7 @@ class nsIScrollableView;
class nsIFrameSelection : public nsISupports {
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAMESELECTION_IID)
enum HINT {HINTLEFT=0,HINTRIGHT=1}mHint;//end of this line or beginning of next
enum HINT { HINTLEFT = 0, HINTRIGHT = 1}; //end of this line or beginning of next
/** Init will initialize the frame selector with the necessary focus tracker to
* be used by most of the methods

2
layout/base/public/nsIFrameSelection.h
View File

@ -132,7 +132,7 @@ class nsIScrollableView;
class nsIFrameSelection : public nsISupports {
public:
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAMESELECTION_IID)
enum HINT {HINTLEFT=0,HINTRIGHT=1}mHint;//end of this line or beginning of next
enum HINT { HINTLEFT = 0, HINTRIGHT = 1}; //end of this line or beginning of next
/** Init will initialize the frame selector with the necessary focus tracker to
* be used by most of the methods

28
layout/generic/nsSelection.cpp
View File

@ -446,9 +446,14 @@ private:
nsPeekOffsetStruct aPos);
#endif // VISUALSELECTION
//post and pop reasons for notifications. we may stack these later
void PostReason(short aReason){mReason = aReason;}
short PopReason(){short retval = mReason; mReason=0;return retval;}
// post and pop reasons for notifications. we may stack these later
void PostReason(PRInt16 aReason) { mSelectionChangeReason = aReason; }
PRInt16 PopReason()
{
PRInt16 retval = mSelectionChangeReason;
mSelectionChangeReason = 0;
return retval;
}
friend class nsTypedSelection;
#ifdef DEBUG
@ -510,13 +515,20 @@ private:
nsIContent *mLimiter; //limit selection navigation to a child of this node.
nsIFocusTracker *mTracker;
PRInt16 mSelectionChangeReason; // reason for notifications of selection changing
PRInt16 mDisplaySelection; //for visual display purposes.
HINT mHint; //hint to tell if the selection is at the end of this line or beginning of next
PRInt32 mDesiredX;
nsIScrollableView *mScrollView;
PRBool mDelayCaretOverExistingSelection;
PRBool mDelayedMouseEventValid;
nsMouseEvent mDelayedMouseEvent;
PRPackedBool mDelayCaretOverExistingSelection;
PRPackedBool mDelayedMouseEventValid;
PRPackedBool mChangesDuringBatching;
PRPackedBool mNotifyFrames;
PRPackedBool mIsEditor;
@ -524,7 +536,6 @@ private:
PRPackedBool mMouseDownState; //for drag purposes
PRPackedBool mMouseDoubleDownState; //has the doubleclick down happened
PRPackedBool mDesiredXSet;
short mReason; //reason for notifications of selection changing
};
class nsSelectionIterator : public nsIBidirectionalEnumerator
@ -986,11 +997,10 @@ nsSelection::nsSelection()
mDelayCaretOverExistingSelection = PR_TRUE;
mDelayedMouseEventValid = PR_FALSE;
mReason = nsISelectionListener::NO_REASON;
mSelectionChangeReason = nsISelectionListener::NO_REASON;
}
nsSelection::~nsSelection()
{
PRInt32 i;
@ -2918,7 +2928,7 @@ nsSelection::SetMouseDownState(PRBool aState)
mMouseDownState = aState;
if (!mMouseDownState)
{
short reason;
PRInt16 reason;
if (aState)
reason = nsISelectionListener::MOUSEDOWN_REASON;
else