diff --git a/mozilla/widget/src/gtk/nsAppShell.cpp b/mozilla/widget/src/gtk/nsAppShell.cpp index f9cd79f73f2..03b27b68783 100644 --- a/mozilla/widget/src/gtk/nsAppShell.cpp +++ b/mozilla/widget/src/gtk/nsAppShell.cpp @@ -396,21 +396,6 @@ NS_IMETHODIMP nsAppShell::Exit() return NS_OK; } -//------------------------------------------------------------------------- -// -// GetNativeData -// -//------------------------------------------------------------------------- -void* nsAppShell::GetNativeData(PRUint32 aDataType) -{ - if (aDataType == NS_NATIVE_SHELL) { - // this isn't accually used, but if it was, we need to gtk_widget_ref() it. - - // return mTopLevel; - } - return nsnull; -} - NS_IMETHODIMP nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *& aEvent) { GdkEvent *event; diff --git a/mozilla/widget/src/gtk/nsAppShell.h b/mozilla/widget/src/gtk/nsAppShell.h index fe1633bd3f1..6f13adb864f 100644 --- a/mozilla/widget/src/gtk/nsAppShell.h +++ b/mozilla/widget/src/gtk/nsAppShell.h @@ -51,7 +51,6 @@ public: nsIWidget *aWidget, PRBool *aForWindow); NS_IMETHOD Exit(); NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener); - virtual void* GetNativeData(PRUint32 aDataType); private: nsDispatchListener *mDispatchListener; diff --git a/mozilla/widget/src/mac/nsAppShell.cpp b/mozilla/widget/src/mac/nsAppShell.cpp index d38ef0d6e2a..84d91b65045 100644 --- a/mozilla/widget/src/mac/nsAppShell.cpp +++ b/mozilla/widget/src/mac/nsAppShell.cpp @@ -217,20 +217,6 @@ NS_METHOD nsAppShell::PopThreadEventQueue() return rv; } -//------------------------------------------------------------------------- -// -// GetNativeData -// -//------------------------------------------------------------------------- -void* nsAppShell::GetNativeData(PRUint32 aDataType) -{ - if (aDataType == NS_NATIVE_SHELL) - { - //return mTopLevel; - } - return nsnull; -} - NS_METHOD nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *&aEvent) { diff --git a/mozilla/widget/src/mac/nsAppShell.h b/mozilla/widget/src/mac/nsAppShell.h index 87ff93220e1..929fe09fba6 100644 --- a/mozilla/widget/src/mac/nsAppShell.h +++ b/mozilla/widget/src/mac/nsAppShell.h @@ -68,8 +68,6 @@ class nsAppShell : public nsIAppShell NS_IMETHOD Exit(); NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener); - virtual void* GetNativeData(PRUint32 aDataType); - NS_IMETHOD GetNativeEvent(PRBool &aRealEvent, void *&aEvent); NS_IMETHOD DispatchNativeEvent(PRBool aRealEvent, void *aEvent); NS_IMETHOD EventIsForModalWindow(PRBool aRealEvent, void *aEvent, nsIWidget *aWidget, diff --git a/mozilla/widget/src/windows/nsAppShell.cpp b/mozilla/widget/src/windows/nsAppShell.cpp index ce4a67ff49a..bd71af2c56c 100644 --- a/mozilla/widget/src/windows/nsAppShell.cpp +++ b/mozilla/widget/src/windows/nsAppShell.cpp @@ -227,17 +227,3 @@ nsAppShell::~nsAppShell() { } -//------------------------------------------------------------------------- -// -// GetNativeData -// -//------------------------------------------------------------------------- -void* nsAppShell::GetNativeData(PRUint32 aDataType) -{ - if (aDataType == NS_NATIVE_SHELL) { - return NULL; - } - return nsnull; -} - - diff --git a/mozilla/widget/src/windows/nsAppShell.h b/mozilla/widget/src/windows/nsAppShell.h index 8c33ad0b7b2..db9994abb94 100644 --- a/mozilla/widget/src/windows/nsAppShell.h +++ b/mozilla/widget/src/windows/nsAppShell.h @@ -50,7 +50,6 @@ class nsAppShell : public nsIAppShell NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener); NS_IMETHOD Exit(); - virtual void * GetNativeData(PRUint32 aDataType); private: nsDispatchListener* mDispatchListener;