From bcb1a29e8fc75d97c37bfc58bc033b226d64a515 Mon Sep 17 00:00:00 2001 From: "mjudge%netscape.com" Date: Thu, 3 Dec 1998 21:48:32 +0000 Subject: [PATCH] new selection change to come ifdefs going in git-svn-id: svn://10.0.0.236/trunk@15730 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 3 +++ mozilla/layout/html/document/src/makefile.win | 5 ++++- mozilla/layout/html/document/src/nsHTMLDocument.cpp | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 6d49d3f6a70..c56dba83093 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -52,9 +52,12 @@ // Find/Serach Includes +#if XP_NEW_SELECTION +#else #include "nsISelection.h" #include "nsSelectionRange.h" #include "nsSelectionPoint.h" +#endif const PRInt32 kForward = 0; const PRInt32 kBackward = 1; diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index 9b84aefd5e7..1ab7be78c7d 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -21,7 +21,10 @@ LIBRARY_NAME=raptorhtmldoc_s MODULE=raptor REQUIRES=xpcom raptor pref -DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN +!if defined(XP_NEW_SELECTION) +DEFINES = $(DEFINES) -DXP_NEW_SELECTION +!endif CPPSRCS= \ nsHTMLContentSink.cpp \ diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 6d49d3f6a70..c56dba83093 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -52,9 +52,12 @@ // Find/Serach Includes +#if XP_NEW_SELECTION +#else #include "nsISelection.h" #include "nsSelectionRange.h" #include "nsSelectionPoint.h" +#endif const PRInt32 kForward = 0; const PRInt32 kBackward = 1;