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
This commit is contained in:
@@ -26,6 +26,7 @@ MAKE_OBJ_TYPE = DLL
|
||||
|
||||
MODULE=webclient
|
||||
|
||||
DIRS = win32
|
||||
|
||||
OBJS = \
|
||||
.\$(OBJDIR)\ns_util.obj \
|
||||
@@ -55,6 +56,7 @@ OBJS = \
|
||||
.\$(OBJDIR)\PreferencesImpl.obj \
|
||||
.\$(OBJDIR)\PreferencesActionEvents.obj \
|
||||
.\$(OBJDIR)\ISupportsPeer.obj \
|
||||
.\win32\$(OBJDIR)\Win32BrowserControlCanvas.obj \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -85,6 +87,7 @@ LLIBS = \
|
||||
$(DIST)\lib\nspr4.lib \
|
||||
$(DIST)\lib\plc4.lib \
|
||||
$(DIST)\lib\plds4.lib \
|
||||
$(JDKHOME)\jre\lib\jawt.lib \
|
||||
$(NULL)
|
||||
|
||||
WIN_LIBS= \
|
||||
@@ -111,6 +114,7 @@ include <$(DEPTH)\config\rules.mak>
|
||||
INCS = \
|
||||
-I..\bal\ \
|
||||
-I..\bal\win32 \
|
||||
-Iwin32 \
|
||||
$(INCS) \
|
||||
$(NULL)
|
||||
!else
|
||||
@@ -145,11 +149,7 @@ install:: $(DLL) buildRunems
|
||||
|
||||
|
||||
clobber_all:: clobber
|
||||
!ifdef PACKAGE_BUILD
|
||||
rm -rf $(DIST)\javadev
|
||||
rm -f $(DIST)\$(DLLNAME)_$(PACKAGE_VER).xpi
|
||||
rm -f $(DIST)\install.js
|
||||
!endif
|
||||
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(DLLNAME).dll
|
||||
|
||||
Reference in New Issue
Block a user