From c155898a21f68c69a8034afc37ec4e0fa7e03217 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Sat, 25 Jan 2003 04:09:06 +0000
Subject: [PATCH] Added missing quantize.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.txt |  1 +
 src/gtk/files.lst              |  1 +
 src/gtk1/files.lst             |  1 +
 src/mac/carbon/files.lst       |  1 +
 src/mac/files.lst              |  1 +
 src/mgl/files.lst              |  1 +
 src/microwin/files.lst         |  1 +
 src/motif/files.lst            |  1 +
 src/msw/files.lst              |  3 +++
 src/msw/makefile.b32           | 27 ++++++++++++++++++++++++---
 src/msw/makefile.wat           |  8 ++++----
 src/os2/files.lst              |  1 +
 src/wxUniv.dsp                 |  4 ++++
 src/wxWindows.dsp              |  4 ++++
 src/x11/files.lst              |  1 +
 15 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 579aad7685..710af7dac1 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -916,6 +916,7 @@ progdlg.h	WXH
 prop.h	WXH
 propform.h	WXH
 proplist.h	WXH
+quantize.h	WXH
 radiobox.h	WXH
 radiobut.h	WXH
 regex.h	WXH	Base
diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 0f77d8693d..03398c6f5f 100644
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -433,6 +433,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 0f77d8693d..03398c6f5f 100644
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -433,6 +433,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index fa26606755..22da2ecf6f 100644
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -439,6 +439,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/mac/files.lst b/src/mac/files.lst
index fa26606755..22da2ecf6f 100644
--- a/src/mac/files.lst
+++ b/src/mac/files.lst
@@ -439,6 +439,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index 083c26b21f..929077e80a 100644
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -395,6 +395,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/microwin/files.lst b/src/microwin/files.lst
index 15a375c000..c042cd61e0 100644
--- a/src/microwin/files.lst
+++ b/src/microwin/files.lst
@@ -395,6 +395,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/motif/files.lst b/src/motif/files.lst
index a940fd9815..b92bffff01 100644
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -427,6 +427,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/msw/files.lst b/src/msw/files.lst
index 95c5664bcc..fee9c28712 100644
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -456,6 +456,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
@@ -988,6 +989,8 @@ GUI_LOWLEVEL_OBJS = \
 		dde.o \
 		dialup.o \
 		dib.o \
+		dirdlg.o \
+		enhmeta.o \
 		evtloop.o \
 		font.o \
 		fontenum.o \
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index c391f36e91..3000d7ad5c 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -223,7 +223,6 @@ GENERICUNIVOBJS= $(MSWDIR)\accel.obj \
 		$(MSWDIR)\dcbuffer.obj \
 		$(MSWDIR)\dcpsg.obj \
 		$(MSWDIR)\dirctrlg.obj \
-		$(MSWDIR)\dirdlgg.obj \
 		$(MSWDIR)\dragimgg.obj \
 		$(MSWDIR)\fdrepdlg.obj \
 		$(MSWDIR)\filedlgg.obj \
@@ -262,6 +261,7 @@ GENERICUNIVOBJS= $(MSWDIR)\accel.obj \
 		$(MSWDIR)\wizard.obj
 
 MSWUNIVOBJS = $(MSWDIR)\app.obj \
+		$(MSWDIR)\automtn.obj \
 		$(MSWDIR)\bitmap.obj \
 		$(MSWDIR)\brush.obj \
 		$(MSWDIR)\caret.obj \
@@ -269,6 +269,7 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
 		$(MSWDIR)\colour.obj \
 		$(MSWDIR)\cursor.obj \
 		$(MSWDIR)\data.obj \
+		$(MSWDIR)\dataobj.obj \
 		$(MSWDIR)\dc.obj \
 		$(MSWDIR)\dcclient.obj \
 		$(MSWDIR)\dcmemory.obj \
@@ -278,6 +279,10 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
 		$(MSWDIR)\dialup.obj \
 		$(MSWDIR)\dib.obj \
 		$(MSWDIR)\dir.obj \
+		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\dropsrc.obj \
+		$(MSWDIR)\droptgt.obj \
+		$(MSWDIR)\enhmeta.obj \
 		$(MSWDIR)\evtloop.obj \
 		$(MSWDIR)\font.obj \
 		$(MSWDIR)\fontenum.obj \
@@ -295,6 +300,7 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
 		$(MSWDIR)\main.obj \
 		$(MSWDIR)\mimetype.obj \
 		$(MSWDIR)\minifram.obj \
+		$(MSWDIR)\oleutils.obj \
 		$(MSWDIR)\palette.obj \
 		$(MSWDIR)\pen.obj \
 		$(MSWDIR)\popupwin.obj \
@@ -310,6 +316,7 @@ MSWUNIVOBJS = $(MSWDIR)\app.obj \
 		$(MSWDIR)\toplevel.obj \
 		$(MSWDIR)\utils.obj \
 		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\uuid.obj \
 		$(MSWDIR)\volume.obj \
 		$(MSWDIR)\wave.obj \
 		$(MSWDIR)\window.obj
@@ -584,6 +591,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
@@ -598,6 +607,8 @@ $(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
 $(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
+$(MSWDIR)\dataobj.obj: $(OLEDIR)\dataobj.$(SRCSUFF)
+
 $(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
 $(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
@@ -616,6 +627,14 @@ $(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
 $(MSWDIR)\dir.obj: $(MSWDIR)\dir.$(SRCSUFF)
 
+$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
+
+$(MSWDIR)\dropsrc.obj: $(OLEDIR)\dropsrc.$(SRCSUFF)
+
+$(MSWDIR)\droptgt.obj: $(OLEDIR)\droptgt.$(SRCSUFF)
+
+$(MSWDIR)\enhmeta.obj: $(MSWDIR)\enhmeta.$(SRCSUFF)
+
 $(MSWDIR)\evtloop.obj: $(MSWDIR)\evtloop.$(SRCSUFF)
 
 $(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
@@ -650,6 +669,8 @@ $(MSWDIR)\mimetype.obj: $(MSWDIR)\mimetype.$(SRCSUFF)
 
 $(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
+$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
+
 $(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
 $(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
@@ -680,6 +701,8 @@ $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
 $(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
+$(MSWDIR)\uuid.obj: $(OLEDIR)\uuid.$(SRCSUFF)
+
 $(MSWDIR)\volume.obj: $(MSWDIR)\volume.$(SRCSUFF)
 
 $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
@@ -1291,8 +1314,6 @@ $(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
 
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
 
-$(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
-
 $(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
 
 $(MSWDIR)\fdrepdlg.obj: $(GENDIR)\fdrepdlg.$(SRCSUFF)
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 74898a49c8..388cac253c 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -11,7 +11,7 @@
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)_w.lib
+LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)$(WATCOM_SUFFIX).lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
@@ -362,11 +362,11 @@ $(OUTPUTDIR):
 $(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx
 	copy $(WXDIR)\include\wx\msw\setup.h $@
 
-LBCFILE=$(OUTPUTDIR)wx$(TOOLKIT).lbc
+LBCFILE=wx$(TOOLKIT).lbc
 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
-    $(LIB) /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)
+    wlib /b /c /n /p=512 $^@ @$(LBCFILE)
 
 
 clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)
@@ -1109,7 +1109,7 @@ $(OUTPUTDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
-    copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
 
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
diff --git a/src/os2/files.lst b/src/os2/files.lst
index 53eb780483..9d528c5849 100644
--- a/src/os2/files.lst
+++ b/src/os2/files.lst
@@ -432,6 +432,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index 7ead8d3e2d..27a0ff76d8 100644
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -1962,6 +1962,10 @@ SOURCE=..\include\wx\proplist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\quantize.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\radiobox.h
 # End Source File
 # Begin Source File
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 7a5ae5bca5..9e0c83457e 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -2170,6 +2170,10 @@ SOURCE=..\include\wx\proplist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\quantize.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\radiobox.h
 # End Source File
 # Begin Source File
diff --git a/src/x11/files.lst b/src/x11/files.lst
index 0db08379b8..c06c7c0ecf 100644
--- a/src/x11/files.lst
+++ b/src/x11/files.lst
@@ -404,6 +404,7 @@ ALL_HEADERS = \
 		prop.h \
 		propform.h \
 		proplist.h \
+		quantize.h \
 		radiobox.h \
 		radiobut.h \
 		regex.h \
-- 
2.45.2