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

Merging JAVADEV_RTM_20001102 into Trunk

Browse Source 
_Ashu


git-svn-id: svn://10.0.0.236/trunk@91051 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ashuk%eng.sun.com
2001-04-02 21:18:06 +00:00
parent 6657eede2c
commit e483742f91
119 changed files with 8389 additions and 2560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/java/webclient/src_moz/WindowControlImpl.cpp
View File

@@ -27,8 +27,10 @@
*/
#include "WindowControlImpl.h"
#include "WindowControlActionEvents.h"
#include "ns_util.h"
#include "nsActions.h"
#include "nsIThread.h" // for PRThread
@@ -85,11 +87,10 @@ JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlI
initContext->webShell = nsnull;
initContext->docShell = nsnull;
initContext->baseWindow = nsnull;
initContext->sHistory = nsnull;
initContext->webNavigation = nsnull;
initContext->presShell = nsnull;
initContext->embeddedThread = nsnull;
initContext->actionQueue = nsnull;
// initContext->embeddedThread = nsnull;
// initContext->actionQueue = nsnull;
initContext->env = env;
initContext->nativeEventThread = nsnull;
initContext->stopThread = FALSE;
@@ -103,6 +104,12 @@ JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlI
util_InitializeShareInitContext(&(initContext->shareContext));
#ifdef XP_UNIX
/***** Uncomment this to debug on unix
pid_t pid = getpid();
printf("++++++++++++++++debug: edburns: pid is: %d\n", pid);
sleep(7);
**************/
initContext->gtkWinPtr =
(int)::util_GetGTKWinPtrFromCanvas(env, aBrowserControlImpl);
#else
@@ -132,7 +139,7 @@ Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeDestroyInitCo
::util_ThrowExceptionToJava(env, "Exception: Can't destroy initContext");
return;
}
initContext->actionQueue = nsnull;
// initContext->actionQueue = nsnull;
delete initContext;
}