Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed param from PRUint32 to PRInt16 in nsFrame::GetDataForTableSelection; enums for param moved from .h file to .idl file. Part of table selection work, b=57863, r=jfrancis, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@83880 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com 2000-12-20 01:36:55 +00:00
parent 2fc3e46191
commit 15a86eda61
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/layout/generic/nsFrame.cpp
View File

@ -50,6 +50,7 @@
#include "nsHTMLIIDs.h"
#include "nsIEventStateManager.h"
#include "nsISelection.h"
#include "nsISelectionPrivate.h"
#include "nsIFrameSelection.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
@ -785,7 +786,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
NS_IMETHODIMP
nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget)
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt16 *aTarget)
{
if (!aFrameSelection || !aMouseEvent || !aParentContent || !aContentOffset || !aTarget)
return NS_ERROR_NULL_POINTER;
@ -894,15 +895,15 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
#if 0
if (selectRow)
*aTarget = TABLESELECTION_ROW;
*aTarget = nsISelectionPrivate::TABLESELECTION_ROW;
else if (selectColumn)
*aTarget = TABLESELECTION_COLUMN;
*aTarget = nsISelectionPrivate::TABLESELECTION_COLUMN;
else
#endif
if (foundCell)
*aTarget = TABLESELECTION_CELL;
*aTarget = nsISelectionPrivate::TABLESELECTION_CELL;
else if (foundTable)
*aTarget = TABLESELECTION_TABLE;
*aTarget = nsISelectionPrivate::TABLESELECTION_TABLE;
return NS_OK;
}
@ -1129,7 +1130,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
// Let Ctrl/Cmd+mouse down do table selection instead of drag initiation
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
rv = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(rv) && parentContent)
{
@ -1381,7 +1382,7 @@ NS_IMETHODIMP nsFrame::HandleDrag(nsIPresContext* aPresContext,
// Check if we are dragging in a table cell
nsCOMPtr<nsIContent> parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
nsMouseEvent *me = (nsMouseEvent *)aEvent;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)
@ -1490,7 +1491,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsIPresContext* aPresContext,
me = (nsMouseEvent *)aEvent;
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)

2
mozilla/layout/generic/nsFrame.h
View File

@ -437,7 +437,7 @@ protected:
// aTarget tells us what table element to select (currently only cell and table supported)
// (enums for this are defined in nsIFrame.h)
NS_IMETHOD GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget);
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt16 *aTarget);
static void XMLQuote(nsString& aString);

17
mozilla/layout/html/base/src/nsFrame.cpp
View File

@ -50,6 +50,7 @@
#include "nsHTMLIIDs.h"
#include "nsIEventStateManager.h"
#include "nsISelection.h"
#include "nsISelectionPrivate.h"
#include "nsIFrameSelection.h"
#include "nsHTMLParts.h"
#include "nsLayoutAtoms.h"
@ -785,7 +786,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext,
NS_IMETHODIMP
nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget)
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt16 *aTarget)
{
if (!aFrameSelection || !aMouseEvent || !aParentContent || !aContentOffset || !aTarget)
return NS_ERROR_NULL_POINTER;
@ -894,15 +895,15 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
#if 0
if (selectRow)
*aTarget = TABLESELECTION_ROW;
*aTarget = nsISelectionPrivate::TABLESELECTION_ROW;
else if (selectColumn)
*aTarget = TABLESELECTION_COLUMN;
*aTarget = nsISelectionPrivate::TABLESELECTION_COLUMN;
else
#endif
if (foundCell)
*aTarget = TABLESELECTION_CELL;
*aTarget = nsISelectionPrivate::TABLESELECTION_CELL;
else if (foundTable)
*aTarget = TABLESELECTION_TABLE;
*aTarget = nsISelectionPrivate::TABLESELECTION_TABLE;
return NS_OK;
}
@ -1129,7 +1130,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
// Let Ctrl/Cmd+mouse down do table selection instead of drag initiation
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
rv = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(rv) && parentContent)
{
@ -1381,7 +1382,7 @@ NS_IMETHODIMP nsFrame::HandleDrag(nsIPresContext* aPresContext,
// Check if we are dragging in a table cell
nsCOMPtr<nsIContent> parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
nsMouseEvent *me = (nsMouseEvent *)aEvent;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)
@ -1490,7 +1491,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsIPresContext* aPresContext,
me = (nsMouseEvent *)aEvent;
nsCOMPtr<nsIContent>parentContent;
PRInt32 contentOffset;
PRUint32 target;
PRInt16 target;
result = GetDataForTableSelection(frameselection, me, getter_AddRefs(parentContent), &contentOffset, &target);
if (NS_SUCCEEDED(result) && parentContent)

2
mozilla/layout/html/base/src/nsFrame.h
View File

@ -437,7 +437,7 @@ protected:
// aTarget tells us what table element to select (currently only cell and table supported)
// (enums for this are defined in nsIFrame.h)
NS_IMETHOD GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEvent *aMouseEvent,
nsIContent **aParentContent, PRInt32 *aContentOffset, PRUint32 *aTarget);
nsIContent **aParentContent, PRInt32 *aContentOffset, PRInt16 *aTarget);
static void XMLQuote(nsString& aString);