Fix for bug 46861. nsIDOMWindow is now split into two interfaces: a public interface (still called nsIDOMWindow) for embedders and an internal interface (nsIDOMWindowInternal) for internal use. The union of the two interfaces is still visible from JavaScript. r=jst@netscape.com
git-svn-id: svn://10.0.0.236/trunk@77828 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "nsWidgetsCID.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIDOMWindow.h"
|
||||
#include "nsIDOMWindowInternal.h"
|
||||
#include "nsIScriptGlobalObject.h"
|
||||
#include "nsIWebShell.h"
|
||||
#include "nsIDocShell.h"
|
||||
@@ -47,7 +47,7 @@ static NS_DEFINE_CID(kCFileWidgetCID, NS_FILEWIDGET_CID);
|
||||
//
|
||||
// This was cribbed from nsBaseFilePicker.cpp. I will
|
||||
// echo the comment that appears there: aaaarrrrrrgh!
|
||||
static nsIWidget *parentWidget( nsIDOMWindow *window ) {
|
||||
static nsIWidget *parentWidget( nsIDOMWindowInternal *window ) {
|
||||
nsIWidget *result = 0;
|
||||
if ( window ) {
|
||||
nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface( window );
|
||||
@@ -291,7 +291,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseDirectory(const char *title, char **_r
|
||||
} // nsFileSpecWithUIImpl::chooseDirectory
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFileSpecWithUIImpl::GetParentWindow( nsIDOMWindow **aResult ) {
|
||||
nsFileSpecWithUIImpl::GetParentWindow( nsIDOMWindowInternal **aResult ) {
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
if ( aResult ) {
|
||||
@@ -305,7 +305,7 @@ nsFileSpecWithUIImpl::GetParentWindow( nsIDOMWindow **aResult ) {
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFileSpecWithUIImpl::SetParentWindow( nsIDOMWindow *aParentWindow ) {
|
||||
nsFileSpecWithUIImpl::SetParentWindow( nsIDOMWindowInternal *aParentWindow ) {
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
// Release current parent.
|
||||
|
||||
Reference in New Issue
Block a user