ashuk%eng.sun.com b01e7aac74 Bug=81648
author=ashuk
r=edburns

Files modified:

M mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/win32/Win32BrowserControlCanvas.java
M mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/MotifBrowserControlCanvas.java
M mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlCanvas.java

M mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.cpp
M mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvas.h
M mozilla/java/webclient/src_moz/motif/MotifBrowserControlCanvasStub.cpp
M mozilla/java/webclient/src_moz/Makefile.in
M mozilla/java/webclient/src_moz/Makefile.win

A mozilla/java/webclient/src_moz/win32/Makefile.win
A mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp
A mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.h


This fix removes the deprecated methods used in Webclient and
now uses the JAWT Native Interface for allowing the Java AWT
canvas access to the native peer window.


git-svn-id: svn://10.0.0.236/trunk@95940 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-25 23:09:54 +00:00

161 lines
3.7 KiB
Makefile

#!nmake
#
# 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
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Sun Microsystems,
# Inc. Portions created by Sun are
# Copyright (C) 1999 Sun Microsystems, Inc. All
# Rights Reserved.
#
# Contributor(s):
DEPTH=..\..\..
IGNORE_MANIFEST=1
MAKE_OBJ_TYPE = DLL
MODULE=webclient
DIRS = win32
OBJS = \
.\$(OBJDIR)\ns_util.obj \
.\$(OBJDIR)\ns_util_export.obj \
.\$(OBJDIR)\rdf_util.obj \
.\$(OBJDIR)\dom_util.obj \
.\$(OBJDIR)\nsActions.obj \
.\$(OBJDIR)\CurrentPageImpl.obj \
.\$(OBJDIR)\CurrentPageActionEvents.obj \
.\$(OBJDIR)\HistoryImpl.obj \
.\$(OBJDIR)\HistoryActionEvents.obj \
.\$(OBJDIR)\BookmarksImpl.obj \
.\$(OBJDIR)\WrapperFactoryImpl.obj \
.\$(OBJDIR)\WindowControlImpl.obj \
.\$(OBJDIR)\WindowControlActionEvents.obj \
.\$(OBJDIR)\InputStreamShim.obj \
.\$(OBJDIR)\NavigationImpl.obj \
.\$(OBJDIR)\NavigationActionEvents.obj \
.\$(OBJDIR)\CBrowserContainer.obj \
.\$(OBJDIR)\PromptActionEvents.obj \
.\$(OBJDIR)\NativeEventThreadActionEvents.obj \
.\$(OBJDIR)\NativeEventThread.obj \
.\$(OBJDIR)\RDFEnumeration.obj \
.\$(OBJDIR)\RDFTreeNode.obj \
.\$(OBJDIR)\RDFActionEvents.obj \
.\$(OBJDIR)\wsRDFObserver.obj \
.\$(OBJDIR)\PreferencesImpl.obj \
.\$(OBJDIR)\PreferencesActionEvents.obj \
.\$(OBJDIR)\ISupportsPeer.obj \
.\win32\$(OBJDIR)\Win32BrowserControlCanvas.obj \
$(NULL)
LCFLAGS = \
-DDEBUG_RAPTOR_CANVAS \
$(NULL)
!ifdef BAL_INTERFACE
LCFLAGS = \
$(LCFLAGS) \
-DBAL_INTERFACE \
$(NULL)
DLLNAME = webclient_bal
!else
DLLNAME = webclient
!endif
DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS = \
$(DIST)\lib\baseembed_s.lib \
$(DIST)\lib\raptorbasewidget_s.lib \
$(DIST)\lib\gkwidget.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\gkgfxwin.lib \
$(DIST)\lib\nsreg.lib \
$(DIST)\lib\nspr4.lib \
$(DIST)\lib\plc4.lib \
$(DIST)\lib\plds4.lib \
$(JDKHOME)\jre\lib\jawt.lib \
$(NULL)
WIN_LIBS= \
ole32.lib \
comdlg32.lib \
shell32.lib \
version.lib \
$(NULL)
!ifdef BAL_INTERFACE
LLIBS = $(LLIBS) \
$(DIST)\lib\wc_share_bal.lib \
$(NULL)
!else
LLIBS = $(LLIBS) \
$(DIST)\lib\wc_share.lib \
$(NULL)
!endif
include <$(DEPTH)\config\rules.mak>
!ifdef BAL_INTERFACE
INCS = \
-I..\bal\ \
-I..\bal\win32 \
-Iwin32 \
$(INCS) \
$(NULL)
!else
INCS = \
-I$(JDKHOME)\include \
-I$(JDKHOME)\include\win32 \
$(INCS) \
$(NULL)
!endif
INCS = \
-I..\src_share \
$(INCS) \
$(NULL)
!CMDSWITCHES -S
# generate the jni header
buildRunems:
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
copy $(DIST)\bin\windbgdlg.exe $(JDKHOME)\bin
!ifdef BAL_INTERFACE
!else
@echo +++ Creating runem.bat. Use this to run the test browser.
rm -f runem.bat
@echo $(PERL) ..\src_share\runem.pl org.mozilla.webclient.test.EmbeddedMozillaImpl $(DEPTH) %1% >> runem.bat
!endif
install:: $(DLL) buildRunems
clobber_all:: clobber
clobber::
rm -f $(DIST)\bin\$(DLLNAME).dll
!ifdef PACKAGE_BUILD
rm -f runem_win_commercial.bat
!else
rm -f runem.bat
!endif