activate new xpm handler under Classic Mac OS after xpm handler fixes

[wxWidgets.git] / src / mac / carbon / files.lst

diff --git a/src/mac/carbon/files.lst b/src/mac/carbon/files.lst
index 763370b66c36810a1fbbff69a4740b8d6365167d..e628fe490e6afb543fbb55e5b4e67844388f01ac 100644 (file)
--- a/src/mac/carbon/files.lst
+++ b/src/mac/carbon/files.lst
@@ -90,6 +90,7 @@ ALL_SOURCES = \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \
                common/imagpng.cpp \
                common/imagpnm.cpp \
                common/imagtiff.cpp \

+               common/imagxpm.cpp \

                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \
                common/intl.cpp \
                common/ipcbase.cpp \
                common/layout.cpp \


@@ -138,6 +139,7 @@ ALL_SOURCES = \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \
                common/wincmn.cpp \
                common/wxchar.cpp \
                common/wxexpr.cpp \

+               common/xpmdecod.cpp \

                common/zipstrm.cpp \
                common/zstream.cpp \
                html/helpctrl.cpp \
                common/zipstrm.cpp \
                common/zstream.cpp \
                html/helpctrl.cpp \


@@ -259,6 +261,7 @@ ALL_HEADERS = \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \
                imagpng.h \
                imagpnm.h \
                imagtiff.h \

+               imagxpm.h \

                intl.h \
                ioswrap.h \
                ipcbase.h \
                intl.h \
                ioswrap.h \
                ipcbase.h \


@@ -365,6 +368,7 @@ ALL_HEADERS = \
                wx_cw_d.h \
                wxchar.h \
                wxexpr.h \
                wx_cw_d.h \
                wxchar.h \
                wxexpr.h \

+               xpmdecod.h \

                wxhtml.h \
                wxprec.h \
                xpmhand.h \
                wxhtml.h \
                wxprec.h \
                xpmhand.h \


@@ -476,6 +480,7 @@ COMMONOBJS = \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \
                imagpng.o \
                imagpnm.o \
                imagtiff.o \

+               imagxpm.o \

                intl.o \
                ipcbase.o \
                layout.o \
                intl.o \
                ipcbase.o \
                layout.o \


@@ -525,6 +530,7 @@ COMMONOBJS = \
                wincmn.o \
                wxchar.o \
                wxexpr.o \
                wincmn.o \
                wxchar.o \
                wxexpr.o \

+               xpmdecod.o \

                zipstrm.o \
                zstream.o
 
                zipstrm.o \
                zstream.o
 


@@ -582,6 +588,7 @@ COMMONDEPS = \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \
                imagpng.d \
                imagpnm.d \
                imagtiff.d \

+               imagxpm.d \

                intl.d \
                ipcbase.d \
                layout.d \
                intl.d \
                ipcbase.d \
                layout.d \


@@ -630,14 +637,12 @@ COMMONDEPS = \
                wincmn.d \
                wxchar.d \
                wxexpr.d \
                wincmn.d \
                wxchar.d \
                wxexpr.d \

+               xpmdecod.d \

                zipstrm.d \
                zstream.d
 
 # Not included for Mac OS X
 #              gridg.o
                zipstrm.d \
                zstream.d
 
 # Not included for Mac OS X
 #              gridg.o

-#              imaglist.o
-#              listctrl.o
-#              statusbr.o

 GENERICOBJS = \
                busyinfo.o \
                calctrl.o \
 GENERICOBJS = \
                busyinfo.o \
                calctrl.o \


@@ -656,7 +661,9 @@ GENERICOBJS = \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \
                helphtml.o \
                helpwxht.o \
                helpxlp.o \

+               imaglist.o \

                laywin.o \
                laywin.o \

+               listctrl.o \

                logg.o \
                msgdlgg.o \
                numdlgg.o \
                logg.o \
                msgdlgg.o \
                numdlgg.o \


@@ -671,6 +678,7 @@ GENERICOBJS = \
                scrolwin.o \
                splash.o \
                splitter.o \
                scrolwin.o \
                splash.o \
                splitter.o \

+               statusbr.o \

                tabg.o \
                tbarsmpl.o \
                textdlgg.o \
                tabg.o \
                tbarsmpl.o \
                textdlgg.o \


@@ -720,9 +728,8 @@ GENERICDEPS = \
                wizard.d
 
 # Not included for Mac OS X
                wizard.d
 
 # Not included for Mac OS X

-#              dir.o
+#              dirmac.o

 #              filedlg.o
 #              filedlg.o

-#              notebook.o

 #              statline.o
 #              treectrl.o
 GUIOBJS = \
 #              statline.o
 #              treectrl.o
 GUIOBJS = \


@@ -750,7 +757,7 @@ GUIOBJS = \
                dcprint.o \
                dcscreen.o \
                dialog.o \
                dcprint.o \
                dcscreen.o \
                dialog.o \

-               dirmac.o \
+               dir.o \

                dnd.o \
                font.o \
                fontdlg.o \
                dnd.o \
                font.o \
                fontdlg.o \


@@ -761,10 +768,8 @@ GUIOBJS = \
                gdiobj.o \
                gsocket.o \
                icon.o \
                gdiobj.o \
                gsocket.o \
                icon.o \

-               imaglist.o \

                joystick.o \
                listbox.o \
                joystick.o \
                listbox.o \

-               listctrl.o \

                macnotfy.o \
                main.o \
                mdi.o \
                macnotfy.o \
                main.o \
                mdi.o \


@@ -788,6 +793,7 @@ GUIOBJS = \
                settings.o \
                slider.o \
                spinbutt.o \
                settings.o \
                slider.o \
                spinbutt.o \

+               spinctrl.o \

                statbmp.o \
                statbox.o \
                statbrma.o \
                statbmp.o \
                statbox.o \
                statbrma.o \


@@ -934,3 +940,8 @@ HTMLDEPS = \
                m_tables.d \
                winpars.d
 
                m_tables.d \
                winpars.d
 

+MACRESOURCES = \
+               apprsrc.r \
+               carbrsrc.r \
+               corersrc.r
+