Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M webclient/build.xml

Browse Source 
- src_ie has no clobber, clobber_all, or clean target.  Comment this out
  for now.

M webclient/classes_spec/org/mozilla/webclient/Prompt.java
M webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
M webclient/classes_spec/org/mozilla/webclient/test/UniversalDialog.java
M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CBrowserContainer.h
M webclient/src_moz/Makefile.in
M webclient/src_moz/NativeEventThread.cpp
M webclient/src_moz/NativeEventThreadActionEvents.cpp
M webclient/src_moz/PromptActionEvents.cpp
M webclient/src_moz/PromptActionEvents.h
M webclient/src_share/jni_util.cpp
M webclient/src_share/jni_util.h

- Roll back Kyle Yuan's 20030509 change for nsIPrompt, since it seems to
  break events between the browser and the app.

R webclient/src_moz/PromptService.h
R webclient/classes_spec/org/mozilla/webclient/test/UniversalDialogData.java
R webclient/src_moz/AppComponents.cpp
R webclient/src_moz/AppComponents.h
R webclient/src_moz/PromptService.cpp

- These are new files that Kyle added.


git-svn-id: svn://10.0.0.236/trunk@142372 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2003-05-13 15:22:04 +00:00
parent 7869075fa4
commit 7a173a6e45
18 changed files with 1314 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp
View File

@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
@@ -21,7 +21,6 @@
* Ian Wilkinson <iw@ennoble.com>
* Ashutosh Kulkarni <ashuk@eng.sun.com>
* Ed Burns <edburns@acm.org>
* Kyle Yuan <kyle.yuan@sun.com>
*/
/*
@@ -53,29 +52,22 @@ wsRealizeBrowserEvent::wsRealizeBrowserEvent(WebShellInitContext * yourInitConte
void *
wsRealizeBrowserEvent::handleEvent ()
{
nsresult rv = nsnull;
nsresult rv = nsnull;
nsCOMPtr<nsIWebBrowser> webBrowser = nsnull;
webBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
mInitContext->webBrowser = webBrowser;
// create our BrowserContainer, which implements many many things.
CBrowserContainer *browserContainer =
new CBrowserContainer(mInitContext->webBrowser, mInitContext->env,
mInitContext);
mInitContext->browserContainer = browserContainer;
webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, browserContainer));
// Get the BaseWindow from the DocShell - upcast
// nsCOMPtr<nsIBaseWindow> docShellAsWin(do_QueryInterface(webBrowser));
nsCOMPtr<nsIBaseWindow> baseWindow;
baseWindow = do_QueryInterface(webBrowser, &rv);
mInitContext->baseWindow = baseWindow;
nsCOMPtr<nsIBaseWindow> docShellAsWin;
rv = webBrowser->QueryInterface(NS_GET_IID(nsIBaseWindow), getter_AddRefs(docShellAsWin));
mInitContext->baseWindow = docShellAsWin;
printf ("Init the baseWindow\n");
#ifdef XP_UNIX
GtkWidget * bin;
bin = (GtkWidget *) mInitContext->gtkWinPtr;
@@ -86,33 +78,51 @@ wsRealizeBrowserEvent::handleEvent ()
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3, ("Ashu Debugs - Inside InitMozillaStuff(%lx): - after Init Call...\n", mInitContext));
}
#else
#else
rv = mInitContext->baseWindow->InitWindow((nativeWindow) mInitContext->parentHWnd, nsnull,
mInitContext->x, mInitContext->y, mInitContext->w, mInitContext->h);
#endif
printf("Create the BaseWindow...\n");
rv = mInitContext->baseWindow->Create();
if (NS_FAILED(rv)) {
mInitContext->initFailCode = kInitWebShellError;
return (void *) rv;
}
// Create the DocShell
mInitContext->docShell = do_GetInterface(mInitContext->webBrowser);
if (!mInitContext->docShell) {
mInitContext->initFailCode = kCreateDocShellError;
return (void *) rv;
}
// create our BrowserContainer, which implements many many things.
mInitContext->browserContainer =
new CBrowserContainer(mInitContext->webBrowser, mInitContext->env,
mInitContext);
// set the WebShellContainer. This is a pain. It's necessary
// because nsWebShell.cpp still checks for mContainer all over the
// place.
nsCOMPtr<nsIWebShellContainer> wsContainer(do_QueryInterface(mInitContext->browserContainer));
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mInitContext->docShell));
webShell->SetContainer(wsContainer);
// set the TreeOwner
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mInitContext->docShell));
nsCOMPtr<nsIDocShellTreeOwner> treeOwner(do_QueryInterface(mInitContext->browserContainer));
docShellAsItem->SetTreeOwner(treeOwner);
// set the docloaderobserver PENDING(edburns): how to we make our
// presence as a nsIWebProgressListener know?n
printf("Creation Done.....\n");
printf("Creation Done.....\n");
// Get the WebNavigation Object from the DocShell
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mInitContext->docShell));
mInitContext->webNavigation = webNav;
@@ -124,14 +134,14 @@ wsRealizeBrowserEvent::handleEvent ()
return (void *) rv;
}
}
// Set the History
// mInitContext->webNavigation->SetSessionHistory(gHistory);
// Save the sessionHistory in the initContext
// mInitContext->sHistory = gHistory;
printf("Show the webBrowser\n");
// Show the webBrowser
rv = mInitContext->baseWindow->SetVisibility(PR_TRUE);
@@ -139,8 +149,8 @@ wsRealizeBrowserEvent::handleEvent ()
mInitContext->initFailCode = kShowWebShellError;
return (void *) rv;
}
mInitContext->initComplete = TRUE;
mInitContext->initComplete = TRUE;
// we will check this value in WindowCreator::CreateChromeWindow
gNewWindowInitContext = mInitContext;