From a9d3fb9a6cc1b9ccb6e54b73193dcb726d0aa7d1 Mon Sep 17 00:00:00 2001 From: "Jerry.Kirk%Nexwarecorp.com" Date: Wed, 8 Sep 1999 14:40:13 +0000 Subject: [PATCH] First attempt at unix Makefile for the xp directory. Makes use of MOZ_TOOLKIT to include certain files. It creates a static library that is then included into a shared library by each toolkits code. Also checked in the Photon event and filter definition. git-svn-id: svn://10.0.0.236/trunk@46350 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xpcom/appshell/eventloop/xp/Makefile.in | 63 +++++++++++++++++++ .../xpcom/appshell/eventloop/xp/nsIEvent.idl | 3 +- .../appshell/eventloop/xp/nsIEventFilter.idl | 3 +- 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 mozilla/xpcom/appshell/eventloop/xp/Makefile.in diff --git a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in new file mode 100644 index 00000000000..d66bc8035d4 --- /dev/null +++ b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in @@ -0,0 +1,63 @@ +#!gmake +# +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Reserved. + +DEPTH=../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/config.mk + +LIBRARY_NAME=xp_eventloop + +MODULE=xpcom_eventloop_xp + +XPIDLSRCS = \ + nsCEventLoop.idl \ + nsIDispatchListener.idl \ + nsIEvent.idl \ + nsIEventFilter.idl \ + nsIEventLoop.idl \ + nsITranslateListener.idl\ + nsPIEventLoop.idl \ + $(NULL) + +CPPSRCS = \ + nsCBaseAppLoop.cpp \ + nsCBaseBreathLoop.cpp \ + nsCBaseLoop.cpp \ + nsCBaseThreadLoop.cpp \ + nsCLoopModule.cpp \ + $(NULL) + +LOCAL_INCLUDES += -I. + +ifneq (,$(filter gtk photon,$(MOZ_WIDGET_TOOLKIT))) +LOCAL_INCLUDES += -I../$(MOZ_WIDGET_TOOLKIT) +CXXFLAGS += $(TK_CFLAGS) +endif + +REQUIRES = xpcom + +# we don't want the shared lib, but we want to force the creation of a static lib. +override NO_SHARED_LIB=1 +override NO_STATIC_LIB= + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/xpcom/appshell/eventloop/xp/nsIEvent.idl b/mozilla/xpcom/appshell/eventloop/xp/nsIEvent.idl index 7b630f0365c..ce2144b08ab 100644 --- a/mozilla/xpcom/appshell/eventloop/xp/nsIEvent.idl +++ b/mozilla/xpcom/appshell/eventloop/xp/nsIEvent.idl @@ -34,7 +34,8 @@ typedef long nsNativeEventDataType; [scriptable, uuid(2EFB5011-4508-11d3-AEDA-00A024FFC08C)] interface nsNativeEventDataTypes { - const long WinMsgStruct = 1; // Windows MSG structure + const long WinMsgStruct = 1; // Windows MSG structure + const long PhotonMsgStruct = 2; // Photon MSG structure }; [scriptable, uuid(2EFB5004-4508-11d3-AEDA-00A024FFC08C)] diff --git a/mozilla/xpcom/appshell/eventloop/xp/nsIEventFilter.idl b/mozilla/xpcom/appshell/eventloop/xp/nsIEventFilter.idl index a08a4fe6bc3..952c39f67f6 100644 --- a/mozilla/xpcom/appshell/eventloop/xp/nsIEventFilter.idl +++ b/mozilla/xpcom/appshell/eventloop/xp/nsIEventFilter.idl @@ -32,7 +32,8 @@ typedef long nsNativeFilterDataType; [scriptable, uuid(2EFB5012-4508-11d3-AEDA-00A024FFC08C)] interface nsNativeFilterDataTypes { - const long WinFilter = 1; // nsCWinFilter structure + const long WinFilter = 1; // nsCWinFilter structure + const long PhotonFilter = 2; // nsCWinFilter structure };