From 3099171aadd992ea058aae538ec214cc2ae15952 Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Mon, 5 May 2008 23:20:39 +0000 Subject: [PATCH] Reverting unwanted changes git-svn-id: svn://10.0.0.236/trunk@251239 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/gtk2/nsWindow.cpp | 5 ++--- mozilla/widget/src/gtk2/nsWindow.h | 12 ++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp index 317661c493f..5fbcb58c594 100644 --- a/mozilla/widget/src/gtk2/nsWindow.cpp +++ b/mozilla/widget/src/gtk2/nsWindow.cpp @@ -630,9 +630,8 @@ nsWindow::Move(PRInt32 aX, PRInt32 aY) } NS_IMETHODIMP -nsWindow::PlaceBehind(nsTopLevelWidgetZPlacement aPlacement, - nsIWidget *aWidget, - PRBool aActivate) +nsWindow::PlaceBehind(nsIWidget *aWidget, + PRBool aActivate) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/mozilla/widget/src/gtk2/nsWindow.h b/mozilla/widget/src/gtk2/nsWindow.h index 92834c0a8e8..0414e6628f2 100644 --- a/mozilla/widget/src/gtk2/nsWindow.h +++ b/mozilla/widget/src/gtk2/nsWindow.h @@ -186,8 +186,10 @@ public: GdkEventFocus *aEvent); void OnContainerFocusOutEvent(GtkWidget *aWidget, GdkEventFocus *aEvent); - gboolean OnKeyPressEvent(GdkEventKey *aEvent); - gboolean OnKeyReleaseEvent(GdkEventKey *aEvent); + gboolean OnKeyPressEvent(GtkWidget *aWidget, + GdkEventKey *aEvent); + gboolean OnKeyReleaseEvent(GtkWidget *aWidget, + GdkEventKey *aEvent); void OnScrollEvent(GtkWidget *aWidget, GdkEventScroll *aEvent); void OnVisibilityNotifyEvent(GtkWidget *aWidget, @@ -362,12 +364,6 @@ public: gfxASurface *GetThebesSurface(); - virtual void SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout, - PRInt32 aNativeKeyCode, - PRUint32 aModifierFlags, - const nsAString& aCharacters, - const nsAString& aUnmodifiedCharacters); - #ifdef ACCESSIBILITY static PRBool sAccessibilityEnabled; #endif