From 76d63dc88094932a95156bdc769738999d51189d Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Fri, 16 Apr 2004 19:02:21 +0000 Subject: [PATCH] M dom/src/Makefile.in M webclient/src_moz/EmbedWindow.cpp M webclient/src_moz/NativeWrapperFactory.cpp M webclient/src_moz/gtk/Makefile.in - fixes for building under GNU/Linux git-svn-id: svn://10.0.0.236/trunk@154981 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/dom/src/Makefile.in | 4 ++-- mozilla/java/webclient/src_moz/EmbedWindow.cpp | 9 +++++---- mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp | 2 ++ mozilla/java/webclient/src_moz/gtk/Makefile.in | 1 - 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mozilla/java/dom/src/Makefile.in b/mozilla/java/dom/src/Makefile.in index 1039783e2e3..e4d94c53be3 100644 --- a/mozilla/java/dom/src/Makefile.in +++ b/mozilla/java/dom/src/Makefile.in @@ -62,10 +62,10 @@ ifeq ($(OS_ARCH),Linux) INCLUDES += -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux DSO_LDOPTS += \ -L$(JAVAHOME)/jre/lib/i386 \ - -L$(JAVAHOME)/jre/lib/i386/classic \ + -L$(JAVAHOME)/jre/lib/i386/client \ -L$(JAVAHOME)/jre/lib/i386/native_threads \ -Xlinker -rpath $(JAVAHOME)/jre/lib/i386 \ - -Xlinker -rpath $(JAVAHOME)/jre/lib/i386/classic \ + -Xlinker -rpath $(JAVAHOME)/jre/lib/i386/client \ -Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \ -ljvm -lhpi DEFINES += -DDISABLE_JIT diff --git a/mozilla/java/webclient/src_moz/EmbedWindow.cpp b/mozilla/java/webclient/src_moz/EmbedWindow.cpp index f54d99c4a36..cd415f75c77 100644 --- a/mozilla/java/webclient/src_moz/EmbedWindow.cpp +++ b/mozilla/java/webclient/src_moz/EmbedWindow.cpp @@ -69,10 +69,11 @@ EmbedWindow::Init(NativeBrowserControl *aOwner) nsresult EmbedWindow::CreateWindow_(void) { - nsresult rv; - int width, height; + nsresult rv; + int width, height; #ifdef XP_UNIX - GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHwnd)); + PR_ASSERT(PR_FALSE); + GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHWnd)); width = ownerAsWidget->allocation.width; height = ownerAsWidget->allocation.height; #else @@ -354,7 +355,7 @@ NS_IMETHODIMP EmbedWindow::GetSiteWindow(void **aSiteWindow) { #ifdef XP_UNIX - GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHwnd)); + GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHWnd)); #else HWND ownerAsWidget = mOwner->parentHWnd; #endif diff --git a/mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp b/mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp index 28835a23c63..7cd223626ca 100644 --- a/mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp +++ b/mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp @@ -114,10 +114,12 @@ NativeWrapperFactory::Init(JNIEnv * env, jobject newNativeEventThread) mFailureCode)); #ifdef XP_UNIX + /************ gdk_input_add(EQueue->GetEventQueueSelectFD(), GDK_INPUT_READ, event_processor_callback, EQueue); + ************/ #endif PLEventQueue * plEventQueue = nsnull; diff --git a/mozilla/java/webclient/src_moz/gtk/Makefile.in b/mozilla/java/webclient/src_moz/gtk/Makefile.in index 46d48124baa..1aae53629e9 100644 --- a/mozilla/java/webclient/src_moz/gtk/Makefile.in +++ b/mozilla/java/webclient/src_moz/gtk/Makefile.in @@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = webclientstub CPPSRCS = \ - GtkBrowserControlCanvasStub.cpp \ $(NULL) include $(topsrcdir)/config/rules.mk