mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changed nsIPresContext& to nsIPresContext*. Changed nsEventStatus& to nsEventStatus*.

This commit is contained in:
tbogard%aol.net 1999-11-24 06:03:10 +00:00
Родитель ac4e9c302a
Коммит 4b3666e214
8 изменённых файлов: 22 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
view/public/nsIView.h
Просмотреть файл

@ -148,7 +148,7 @@ public:
* @param aEventFlags see nsIView.h for flag definitions
* @result processing status
*/
NS_IMETHOD HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags, nsEventStatus &aStatus, PRBool& aHandled) = 0;
NS_IMETHOD HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags, nsEventStatus* aStatus, PRBool& aHandled) = 0;
/**
* Called to indicate that the position of the view has been changed.

2
view/public/nsIViewManager.h
Просмотреть файл

@ -149,7 +149,7 @@ public:
* @param event event to dispatch
* @result event handling status
*/
NS_IMETHOD DispatchEvent(nsGUIEvent *aEvent, nsEventStatus& aStatus) = 0;
NS_IMETHOD DispatchEvent(nsGUIEvent *aEvent, nsEventStatus* aStatus) = 0;
/**
* Used to grab/capture all mouse events for a specific view,

2
view/public/nsIViewObserver.h
Просмотреть файл

@ -56,7 +56,7 @@ public:
*/
NS_IMETHOD HandleEvent(nsIView * aView,
nsGUIEvent* aEvent,
nsEventStatus& aEventStatus) = 0;
nsEventStatus* aEventStatus) = 0;
/* called when the view has been repositioned due to scrolling
* @return error status

11
view/src/nsScrollingView.cpp
Просмотреть файл

@ -47,7 +47,7 @@ public:
ScrollBarView(nsScrollingView *aScrollingView);
~ScrollBarView();
NS_IMETHOD HandleEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags, nsEventStatus &aStatus, PRBool& handled);
NS_IMETHOD HandleEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags, nsEventStatus* aStatus, PRBool& handled);
// Do not set the visibility of the ScrollbarView using SetVisibility. Instead it
// must be marked as visible or hidden using SetEnabled.
@ -83,9 +83,10 @@ ScrollBarView::~ScrollBarView()
}
NS_IMETHODIMP ScrollBarView::HandleEvent(nsGUIEvent *aEvent, PRUint32 aEventFlags,
nsEventStatus &aStatus, PRBool& aHandled)
nsEventStatus* aStatus, PRBool& aHandled)
{
aStatus = nsEventStatus_eIgnore;
NS_ENSURE_ARG_POINTER(aStatus);
*aStatus = nsEventStatus_eIgnore;
switch (aEvent->message)
{
@ -97,7 +98,7 @@ NS_IMETHODIMP ScrollBarView::HandleEvent(nsGUIEvent *aEvent, PRUint32 aEventFlag
NS_ASSERTION((nsnull != mScrollingView), "HandleEvent() called after the ScrollingView has been destroyed.");
if (nsnull != mScrollingView)
mScrollingView->HandleScrollEvent(aEvent, aEventFlags);
aStatus = nsEventStatus_eConsumeNoDefault;
*aStatus = nsEventStatus_eConsumeNoDefault;
break;
default:
@ -778,7 +779,7 @@ void nsScrollingView::Notify(nsITimer * aTimer)
if (NS_OK == mViewManager->GetViewObserver(obs))
{
obs->HandleEvent((nsIView *)this, &event, retval);
obs->HandleEvent((nsIView *)this, &event, &retval);
NS_RELEASE(obs);
}

9
view/src/nsView.cpp
Просмотреть файл

@ -65,7 +65,7 @@ nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent)
nsIViewManager *vm;
view->GetViewManager(vm);
vm->DispatchEvent(aEvent, result);
vm->DispatchEvent(aEvent, &result);
NS_RELEASE(vm);
}
@ -778,8 +778,9 @@ NS_IMETHODIMP nsView :: Paint(nsIRenderingContext& rc, const nsIRegion& region,
}
NS_IMETHODIMP nsView :: HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags,
nsEventStatus &aStatus, PRBool& aHandled)
nsEventStatus* aStatus, PRBool& aHandled)
{
NS_ENSURE_ARG_POINTER(aStatus);
//printf(" %d %d %d %d (%d,%d) \n", this, event->widget, event->widgetSupports,
// event->message, event->point.x, event->point.y);
@ -790,10 +791,10 @@ NS_IMETHODIMP nsView :: HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags,
if (NS_FAILED(mViewManager->GetViewObserver(obs)))
obs = nsnull;
aStatus = nsEventStatus_eIgnore;
*aStatus = nsEventStatus_eIgnore;
//see if any of this view's children can process the event
if (aStatus == nsEventStatus_eIgnore && !(mVFlags & NS_VIEW_PUBLIC_FLAG_DONT_CHECK_CHILDREN)) {
if (*aStatus == nsEventStatus_eIgnore && !(mVFlags & NS_VIEW_PUBLIC_FLAG_DONT_CHECK_CHILDREN)) {
PRInt32 numkids;
nsRect trect;
nscoord x, y;

2
view/src/nsView.h
Просмотреть файл

@ -58,7 +58,7 @@ public:
PRUint32 aPaintFlags, PRBool &aResult);
NS_IMETHOD Paint(nsIRenderingContext& rc, const nsIRegion& region,
PRUint32 aPaintFlags, PRBool &aResult);
NS_IMETHOD HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags, nsEventStatus &aStatus, PRBool& aHandled);
NS_IMETHOD HandleEvent(nsGUIEvent *event, PRUint32 aEventFlags, nsEventStatus* aStatus, PRBool& aHandled);
NS_IMETHOD SetPosition(nscoord x, nscoord y);
NS_IMETHOD GetPosition(nscoord *x, nscoord *y) const;
NS_IMETHOD SetDimensions(nscoord width, nscoord height, PRBool aPaint = PR_TRUE);

11
view/src/nsViewManager.cpp
Просмотреть файл

@ -1552,9 +1552,10 @@ void nsViewManager::UpdateViews(nsIView *aView, PRUint32 aUpdateFlags)
}
}
NS_IMETHODIMP nsViewManager :: DispatchEvent(nsGUIEvent *aEvent, nsEventStatus &aStatus)
NS_IMETHODIMP nsViewManager :: DispatchEvent(nsGUIEvent *aEvent, nsEventStatus* aStatus)
{
aStatus = nsEventStatus_eIgnore;
NS_ENSURE_ARG_POINTER(aStatus);
*aStatus = nsEventStatus_eIgnore;
switch(aEvent->message)
{
@ -1581,7 +1582,7 @@ NS_IMETHODIMP nsViewManager :: DispatchEvent(nsGUIEvent *aEvent, nsEventStatus &
//printf("resize: (pix) %d, %d\n", width, height);
SetWindowDimensions(NSIntPixelsToTwips(width, p2t),
NSIntPixelsToTwips(height, p2t));
aStatus = nsEventStatus_eConsumeNoDefault;
*aStatus = nsEventStatus_eConsumeNoDefault;
}
}
@ -1635,14 +1636,14 @@ NS_IMETHODIMP nsViewManager :: DispatchEvent(nsGUIEvent *aEvent, nsEventStatus &
}
}
aStatus = nsEventStatus_eConsumeNoDefault;
*aStatus = nsEventStatus_eConsumeNoDefault;
}
break;
}
case NS_DESTROY:
aStatus = nsEventStatus_eConsumeNoDefault;
*aStatus = nsEventStatus_eConsumeNoDefault;
break;
default:

2
view/src/nsViewManager.h
Просмотреть файл

@ -64,7 +64,7 @@ public:
NS_IMETHOD UpdateView(nsIView *aView, const nsRect &aRect, PRUint32 aUpdateFlags);
NS_IMETHOD UpdateAllViews(PRUint32 aUpdateFlags);
NS_IMETHOD DispatchEvent(nsGUIEvent *aEvent, nsEventStatus &aStatus);
NS_IMETHOD DispatchEvent(nsGUIEvent *aEvent, nsEventStatus* aStatus);
NS_IMETHOD GrabMouseEvents(nsIView *aView, PRBool &aResult);
NS_IMETHOD GrabKeyEvents(nsIView *aView, PRBool &aresult);