From 5af8d651a658cf4d835d18cd5aa218cb880a03c0 Mon Sep 17 00:00:00 2001 From: "ashuk%eng.sun.com" Date: Fri, 3 Nov 2000 01:30:54 +0000 Subject: [PATCH] author=ashuk Bug=57725,49126 r=a=edburns git-svn-id: svn://10.0.0.236/trunk@82254 18797224-902f-48f8-a5cc-f745e15eee43 --- .../webclient/src_moz/NativeEventThread.cpp | 8 +++---- .../motif/MotifBrowserControlCanvas.cpp | 23 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/mozilla/java/webclient/src_moz/NativeEventThread.cpp b/mozilla/java/webclient/src_moz/NativeEventThread.cpp index b76b2b5169f..47f30a0896f 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThread.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThread.cpp @@ -587,14 +587,12 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext) printf ("Init the baseWindow\n"); #ifdef XP_UNIX - GdkSuperWin * superwin; - GtkMozArea * mozarea; - mozarea = (GtkMozArea *) initContext->gtkWinPtr; - superwin = mozarea->superwin; + GtkWidget * bin; + bin = (GtkWidget *) initContext->gtkWinPtr; if (prLogModuleInfo) { PR_LOG(prLogModuleInfo, 3, ("Ashu Debugs - Inside InitMozillaStuff(%lx): - before Init Call...\n", initContext)); } - rv = initContext->baseWindow->InitWindow((nativeWindow) superwin, nsnull, initContext->x, initContext->y, initContext->w, initContext->h); + rv = initContext->baseWindow->InitWindow((nativeWindow) bin, nsnull, initContext->x, initContext->y, initContext->w, initContext->h); if (prLogModuleInfo) { PR_LOG(prLogModuleInfo, 3, ("Ashu Debugs - Inside InitMozillaStuff(%lx): - after Init Call...\n", initContext)); } diff --git a/mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.cpp b/mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.cpp index f2100c88e2a..86aeb8214b6 100644 --- a/mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.cpp +++ b/mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.cpp @@ -76,22 +76,15 @@ JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_motif_MotifBro */ JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_motif_MotifBrowserControlCanvas_createContainerWindow (JNIEnv * env, jobject obj, jint parent, jint screenWidth, jint screenHeight) { - GtkWidget * window = (GtkWidget *) parent; - GtkWidget *mMozArea = NULL; + + GtkWidget * window = (GtkWidget *) parent; + + gtk_widget_realize(GTK_WIDGET(window)); + gtk_widget_set_uposition(window, screenWidth + 20, screenHeight + 20); + gtk_widget_show(window); + + return (jint) window; - mMozArea = gtk_mozarea_new(); - gtk_container_add(GTK_CONTAINER(window), mMozArea); - gtk_widget_realize(GTK_WIDGET(mMozArea)); - - // HACK: javaMake sure this window doesn't appear onscreen!!!! - gtk_widget_set_uposition(window, screenWidth + 20, screenHeight + 20); - gtk_widget_show(mMozArea); - - gtk_widget_show(window); - - //gtk_main(); - printf ("In MotifBrowserControlCanvas.cpp -- mozArea stored\n\n"); - return (jint) mMozArea; } int getWinID(GtkWidget * gtkWidgetPtr) {