* Fix logical error in m_overflow attribute merging

[wxWidgets.git] / src / mgl / makefile.wat

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index faaf8da49317d9febe13470557e4e6475065fec4..4a121b3f4a301d8c316675a38800514cf0c8116a 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 11:57, 2002/01/17
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -46,6 +46,7 @@ GENERICOBJS= accel.obj &
        caret.obj &
        choicdgg.obj &
        colrdlgg.obj &
+       dcbuffer.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dirdlgg.obj &
@@ -58,20 +59,17 @@ GENERICOBJS= accel.obj &
        gridsel.obj &
        helpext.obj &
        helphtml.obj &
-       helpwxht.obj &
        imaglist.obj &
        laywin.obj &
        listctrl.obj &
        logg.obj &
+       mdig.obj &
        msgdlgg.obj &
        numdlgg.obj &
        panelg.obj &
        printps.obj &
        prntdlgg.obj &
        progdlgg.obj &
-       prop.obj &
-       propform.obj &
-       proplist.obj &
        sashwin.obj &
        scrlwing.obj &
        spinctlg.obj &
@@ -80,15 +78,18 @@ GENERICOBJS= accel.obj &
        tabg.obj &
        tbarsmpl.obj &
        textdlgg.obj &
+       timer.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &
-       treelay.obj &
        wizard.obj
 
 COMMONOBJS = &
        y_tab.obj &
+       accesscmn.obj &
        appcmn.obj &
+       artprov.obj &
+       artstd.obj &
        bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
@@ -101,6 +102,7 @@ COMMONOBJS = &
        cshelp.obj &
        ctrlcmn.obj &
        ctrlsub.obj &
+       datacmn.obj &
        datetime.obj &
        datstrm.obj &
        db.obj &
@@ -113,6 +115,7 @@ COMMONOBJS = &
        dobjcmn.obj &
        docmdi.obj &
        docview.obj &
+       dpycmn.obj &
        dseldlg.obj &
        dynarray.obj &
        dynlib.obj &
@@ -140,11 +143,14 @@ COMMONOBJS = &
        geometry.obj &
        gifdecod.obj &
        hash.obj &
+       hashmap.obj &
        helpbase.obj &
        http.obj &
+       iconbndl.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &
+       imagfill.obj &
        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &
@@ -165,10 +171,10 @@ COMMONOBJS = &
        menucmn.obj &
        mimecmn.obj &
        module.obj &
+       msgout.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &
-       odbc.obj &
        paper.obj &
        popupcmn.obj &
        prntbase.obj &
@@ -177,11 +183,12 @@ COMMONOBJS = &
        quantize.obj &
        radiocmn.obj &
        regex.obj &
-       resource.obj &
+       rgncmn.obj &
        sckaddr.obj &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
+       settcmn.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &
@@ -189,6 +196,7 @@ COMMONOBJS = &
        stream.obj &
        string.obj &
        sysopt.obj &
+       taskbarcmn.obj &
        tbarbase.obj &
        textbuf.obj &
        textcmn.obj &
@@ -208,7 +216,6 @@ COMMONOBJS = &
        wfstream.obj &
        wincmn.obj &
        wxchar.obj &
-       wxexpr.obj &
        xpmdecod.obj &
        zipstrm.obj &
        zstream.obj
@@ -235,7 +242,6 @@ MGLOBJS = app.obj &
        pen.obj &
        region.obj &
        settings.obj &
-       timer.obj &
        toplevel.obj &
        utils.obj &
        window.obj
@@ -271,10 +277,12 @@ UNIVOBJS = bmpbuttn.obj &
        statusbr.obj &
        textctrl.obj &
        theme.obj &
+       toolbar.obj &
        topluniv.obj &
        winuniv.obj
 
 UNIVTHEMEOBJS = gtk.obj &
+       metal.obj &
        win32.obj
 
 HTMLOBJS = helpctrl.obj &
@@ -293,8 +301,8 @@ HTMLOBJS = helpctrl.obj &
        m_layout.obj &
        m_links.obj &
        m_list.obj &
-       m_meta.obj &
        m_pre.obj &
+       m_style.obj &
        m_tables.obj &
        winpars.obj
 
@@ -309,8 +317,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -392,9 +400,6 @@ region.obj:     $(MGLDIR)\region.cpp
 settings.obj:     $(MGLDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-timer.obj:     $(MGLDIR)\timer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 toplevel.obj:     $(MGLDIR)\toplevel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -502,6 +507,9 @@ textctrl.obj:     $(UNIVDIR)\textctrl.cpp
 theme.obj:     $(UNIVDIR)\theme.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toolbar.obj:     $(UNIVDIR)\toolbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 topluniv.obj:     $(UNIVDIR)\topluniv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -513,6 +521,9 @@ winuniv.obj:     $(UNIVDIR)\winuniv.cpp
 gtk.obj:     $(UNIVTHEMEDIR)\gtk.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+metal.obj:     $(UNIVTHEMEDIR)\metal.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -521,9 +532,18 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 ########################################################
 # Common objects (always compiled)
 
+accesscmn.obj:     $(COMMDIR)\accesscmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+artprov.obj:     $(COMMDIR)\artprov.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj:     $(COMMDIR)\artstd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -560,6 +580,9 @@ ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+datacmn.obj:     $(COMMDIR)\datacmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -596,6 +619,9 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dpycmn.obj:     $(COMMDIR)\dpycmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -677,12 +703,18 @@ gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+hashmap.obj:     $(COMMDIR)\hashmap.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpbase.obj:     $(COMMDIR)\helpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -692,6 +724,9 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagfill.obj:     $(COMMDIR)\imagfill.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -752,6 +787,9 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+msgout.obj:     $(COMMDIR)\msgout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -761,9 +799,6 @@ nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-odbc.obj:     $(COMMDIR)\odbc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -788,7 +823,7 @@ radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 regex.obj:     $(COMMDIR)\regex.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-resource.obj:     $(COMMDIR)\resource.cpp
+rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
@@ -803,6 +838,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+settcmn.obj:     $(COMMDIR)\settcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 sizer.obj:     $(COMMDIR)\sizer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -824,6 +862,9 @@ string.obj:     $(COMMDIR)\string.cpp
 sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -881,9 +922,6 @@ wincmn.obj:     $(COMMDIR)\wincmn.cpp
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -928,6 +966,9 @@ choicdgg.obj:     $(GENDIR)\choicdgg.cpp
 colrdlgg.obj:     $(GENDIR)\colrdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dcpsg.obj:     $(GENDIR)\dcpsg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -964,9 +1005,6 @@ helpext.obj:     $(GENDIR)\helpext.cpp
 helphtml.obj:     $(GENDIR)\helphtml.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpwxht.obj:     $(GENDIR)\helpwxht.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 imaglist.obj:     $(GENDIR)\imaglist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -979,6 +1017,9 @@ listctrl.obj:     $(GENDIR)\listctrl.cpp
 logg.obj:     $(GENDIR)\logg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mdig.obj:     $(GENDIR)\mdig.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -997,15 +1038,6 @@ prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prop.obj:     $(GENDIR)\prop.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-propform.obj:     $(GENDIR)\propform.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-proplist.obj:     $(GENDIR)\proplist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1030,6 +1062,9 @@ tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
 textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+timer.obj:     $(GENDIR)\timer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1039,9 +1074,6 @@ tipwin.obj:     $(GENDIR)\tipwin.cpp
 treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-treelay.obj:     $(GENDIR)\treelay.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1099,10 +1131,10 @@ m_links.obj:     $(HTMLDIR)\m_links.cpp
 m_list.obj:     $(HTMLDIR)\m_list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-m_meta.obj:     $(HTMLDIR)\m_meta.cpp
+m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-m_pre.obj:     $(HTMLDIR)\m_pre.cpp
+m_style.obj:     $(HTMLDIR)\m_style.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 m_tables.obj:     $(HTMLDIR)\m_tables.cpp