diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp index 72a44858842..990ac867f6e 100644 --- a/mozilla/editor/base/nsEditorEventListeners.cpp +++ b/mozilla/editor/base/nsEditorEventListeners.cpp @@ -1244,6 +1244,14 @@ nsTextEditorDragListener::HandleEvent(nsIDOMEvent* aEvent) } +nsresult +nsTextEditorDragListener::DragGesture(nsIDOMEvent* aDragEvent) +{ + // ...figure out if a drag should be started... + + return NS_OK; +} + nsresult nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) diff --git a/mozilla/editor/base/nsEditorEventListeners.h b/mozilla/editor/base/nsEditorEventListeners.h index a0d3b7f7947..9ebc4e009be 100644 --- a/mozilla/editor/base/nsEditorEventListeners.h +++ b/mozilla/editor/base/nsEditorEventListeners.h @@ -93,7 +93,6 @@ public: /*BEGIN implementations of textevent handler interface*/ virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: virtual nsresult HandleText(nsIDOMEvent* aTextEvent); /*END implementations of textevent handler interface*/ @@ -125,10 +124,9 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of textevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: - virtual nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent); - virtual nsresult HandleEndComposition(nsIDOMEvent* aCompositionEvent); + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); + virtual nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent); + virtual nsresult HandleEndComposition(nsIDOMEvent* aCompositionEvent); /*END implementations of textevent handler interface*/ protected: @@ -157,8 +155,7 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of mouseevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent); virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent); virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent); @@ -194,12 +191,12 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of dragevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult DragEnter(nsIDOMEvent* aDragEvent); virtual nsresult DragOver(nsIDOMEvent* aDragEvent); virtual nsresult DragExit(nsIDOMEvent* aDragEvent); virtual nsresult DragDrop(nsIDOMEvent* aDragEvent); + virtual nsresult DragGesture(nsIDOMEvent* aDragEvent); /*END implementations of dragevent handler interface*/ protected: @@ -228,8 +225,7 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of focus event handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult Focus(nsIDOMEvent* aEvent); virtual nsresult Blur(nsIDOMEvent* aEvent); /*END implementations of focus event handler interface*/ diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index 72a44858842..990ac867f6e 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -1244,6 +1244,14 @@ nsTextEditorDragListener::HandleEvent(nsIDOMEvent* aEvent) } +nsresult +nsTextEditorDragListener::DragGesture(nsIDOMEvent* aDragEvent) +{ + // ...figure out if a drag should be started... + + return NS_OK; +} + nsresult nsTextEditorDragListener::DragEnter(nsIDOMEvent* aDragEvent) diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.h b/mozilla/editor/libeditor/text/nsEditorEventListeners.h index a0d3b7f7947..9ebc4e009be 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.h +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.h @@ -93,7 +93,6 @@ public: /*BEGIN implementations of textevent handler interface*/ virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: virtual nsresult HandleText(nsIDOMEvent* aTextEvent); /*END implementations of textevent handler interface*/ @@ -125,10 +124,9 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of textevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: - virtual nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent); - virtual nsresult HandleEndComposition(nsIDOMEvent* aCompositionEvent); + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); + virtual nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent); + virtual nsresult HandleEndComposition(nsIDOMEvent* aCompositionEvent); /*END implementations of textevent handler interface*/ protected: @@ -157,8 +155,7 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of mouseevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent); virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent); virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent); @@ -194,12 +191,12 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of dragevent handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult DragEnter(nsIDOMEvent* aDragEvent); virtual nsresult DragOver(nsIDOMEvent* aDragEvent); virtual nsresult DragExit(nsIDOMEvent* aDragEvent); virtual nsresult DragDrop(nsIDOMEvent* aDragEvent); + virtual nsresult DragGesture(nsIDOMEvent* aDragEvent); /*END implementations of dragevent handler interface*/ protected: @@ -228,8 +225,7 @@ public: NS_DECL_ISUPPORTS /*BEGIN implementations of focus event handler interface*/ - virtual nsresult HandleEvent(nsIDOMEvent* aEvent); -public: + virtual nsresult HandleEvent(nsIDOMEvent* aEvent); virtual nsresult Focus(nsIDOMEvent* aEvent); virtual nsresult Blur(nsIDOMEvent* aEvent); /*END implementations of focus event handler interface*/