Added XPM.

3 files changed, 28 insertions, 24 deletions

diff --git a/win32/deps.mak b/win32/deps.mak
index 29e3e5caa..1f691a968 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -3,11 +3,11 @@ ExternalLexer.o: ExternalLexer.cxx ../include/Platform.h \
  ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
  ExternalLexer.h
 PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \
- ../src/UniConversion.h
+ ../src/UniConversion.h ../src/XPM.h
 ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
  ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
+ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
  ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \
  ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
@@ -27,7 +27,7 @@ DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Document.h
 Editor.o: ../src/Editor.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \
- ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
+ ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/Document.h ../src/Editor.h
 Indicator.o: ../src/Indicator.cxx ../include/Platform.h \
@@ -44,8 +44,8 @@ LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \
  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
+ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h \
  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
@@ -111,14 +111,14 @@ LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \
  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/LineMarker.h
+ ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
 PropSet.o: ../src/PropSet.cxx ../include/Platform.h \
  ../include/PropSet.h ../include/SString.h
 RESearch.o: ../src/RESearch.cxx ../src/RESearch.h
 ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
  ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
+ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \
  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
  ../src/ScintillaBase.h
@@ -129,8 +129,9 @@ StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
  ../src/StyleContext.h
 UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h
 ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h
+ ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \
+ ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h
 WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \
  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
  ../include/WindowAccessor.h ../include/Scintilla.h
+XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
diff --git a/win32/makefile b/win32/makefile
index a32633510..94347bedf 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -1,5 +1,5 @@
 # Make file for Scintilla on Windows
-# Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+# Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
 # This makefile assumes the mingw32 version of GCC 2.95.3 is used and changes will
 # be needed to use other compilers.
@@ -43,13 +43,13 @@ LEXOBJS=\
 LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \
 LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLua.o \
 LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPython.o LexRuby.o LexSQL.o \
-LexVB.o 
+LexVB.o
 #--Autogenerated -- end of automatically generated section
 
 SOBJS	= ScintillaWin.o ScintillaBase.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
 	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
-	Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o
+	Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o
 $(COMPONENT): $(SOBJS) Scintilla.def
 	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable
 
@@ -57,7 +57,7 @@ LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \
 	ContractionState.o CellBuffer.o CallTip.o \
 	ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \
 	Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \
-	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o $(LEXOBJS)
+	DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o $(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS) Scintilla.def
 	$(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index e99361877..754c92293 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -1,5 +1,5 @@
 # Make file for Scintilla on Windows Visual C++ and Borland C++ version
-# Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+# Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
 # This makefile is for using Visual C++ with nmake or Borland C++ with make depending on
 # the setting of the VENDOR macro. If no VENDOR is defined n the command line then
@@ -103,7 +103,8 @@ SOBJS=\
 	$(DIR_O)\ScintillaWin.obj \
 	$(DIR_O)\Style.obj \
 	$(DIR_O)\UniConversion.obj \
-	$(DIR_O)\ViewStyle.obj
+	$(DIR_O)\ViewStyle.obj \
+	$(DIR_O)\XPM.obj
 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
@@ -155,6 +156,7 @@ LOBJS=\
 	$(DIR_O)\StyleContext.obj \
 	$(DIR_O)\UniConversion.obj \
 	$(DIR_O)\ViewStyle.obj \
+	$(DIR_O)\XPM.obj \
 	$(LEXOBJS)
 
 $(DIR_O)\ScintRes.res : ScintRes.rc
@@ -222,7 +224,7 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \
  ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/Document.h ../src/Editor.h
+ ../src/Document.h ../src/Editor.h ../src/XPM.h
 $(DIR_O)\ExternalLexer.obj: ExternalLexer.cxx ../include/Platform.h \
  ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
  ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
@@ -286,9 +288,9 @@ $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
 #--Autogenerated -- end of automatically generated section
 
 $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/LineMarker.h
+ ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h
 $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
- ../src/UniConversion.h
+ ../src/UniConversion.h  ../src/XPM.h
 $(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
  ../include/PropSet.h ../include/SString.h
 $(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/RESearch.h
@@ -298,23 +300,23 @@ $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \
  ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
  ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h ../src/XPM.h
 $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
  ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
  ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h
+ ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
+ ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h
 $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
  ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
  ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
  ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \
  ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \
- ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h
+ ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h ../src/XPM.h
 $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
  ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
  ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
  ..\src\ScintillaBase.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h
+ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h
 $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
  ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
  ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
@@ -327,7 +329,8 @@ $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \
 $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h
 $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
  ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h
+ ../src/Style.h ../src/ViewStyle.h ../src/XPM.h
 $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
  ../include/WindowAccessor.h ../include/Scintilla.h
+$(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h