Added missing quantize.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 579aad76852c9447f1080cd50592f42e8369e00b..710af7dac1a070df6b71555cb3b745f772175ccb 100644 (file)
--- 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 0f77d8693d7263a7dff14c3461f4df64c3cc0f14..03398c6f5f2f162c1a67b30ddbee3a57c9513933 100644 (file)
--- 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 0f77d8693d7263a7dff14c3461f4df64c3cc0f14..03398c6f5f2f162c1a67b30ddbee3a57c9513933 100644 (file)
--- 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 fa26606755eb88ac807c0110c75c124ac08280e6..22da2ecf6f7b67b8f8ab0d9eecb670cc125e4178 100644 (file)
--- 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 fa26606755eb88ac807c0110c75c124ac08280e6..22da2ecf6f7b67b8f8ab0d9eecb670cc125e4178 100644 (file)
--- 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 083c26b21fa6bfba1d07b03c6f58d5caeb60397d..929077e80aa260af1e5f9b26b1128c15573c1d4a 100644 (file)
--- 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 15a375c0000eb8d88a58217d2cfa90df939402b9..c042cd61e00912bc9c12bd72a91ff003cd16edf2 100644 (file)
--- 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 a940fd98159217561d7a8fe941ea0c5a403932fa..b92bffff011fb6e85fa72789da758991900e738c 100644 (file)
--- 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 95c5664bccd50734246f959c36aa2ff8dfbee608..fee9c28712d296c7cbc53948f47a81af34dd6934 100644 (file)
--- 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 c391f36e915665d6c1aba50f514a3dec55b81c29..3000d7ad5c885ba98f6760b6eae51f8fadbc8f7f 100644 (file)
--- 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 74898a49c8823f454daf6768e8e940ec7bc1a458..388cac253c59fd0b765356dd4ac58a3a40966dfe 100644 (file)
--- 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 53eb780483d2c6cfe867162cad119f66bf54d8f9..9d528c5849c96517032dd5b3be4245a2180ea075 100644 (file)
--- 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 7ead8d3e2d4490ab6f4876f27296a7d97c4882e7..27a0ff76d811093cff1efdc24b9c7b29185e3bdb 100644 (file)
--- 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 7a5ae5bca50dd2b7faba35fda9bdcbe1cbe9c07c..9e0c83457e680f9191686247433450697b556a37 100644 (file)
--- 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 0db08379b81694af376b1f12f5bac5f9aa4a264f..c06c7c0ecf6ae9dd3321b87bb6a2321ed4895155 100644 (file)
--- 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 \