stop usign a deprecated method, and ensure that the imagelist

[wxWidgets.git] / src / generic / descrip.mms

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index e1006262e5e1b52882709bc38263689464c75d1a..18abc4583e8f4441ae1dcb5db6abcc4e89b0ba65 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -14,9 +14,16 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/ieee=denorm
+.else
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
           /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
+.endif
 .else
 CXX_DEFINE =
 CC_DEFINE =
@@ -41,10 +48,9 @@ OBJECTS = \
                dirdlgg.obj,\
                fontdlgg.obj,\
                grid.obj,\
+               gridctrl.obj,\
+               gridsel.obj,\
                helpext.obj,\
-               helphtml.obj,\
-               helpwxht.obj,\
-               helpxlp.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
@@ -52,17 +58,12 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\
-               plot.obj,\
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\
                sashwin.obj,\
-               scrolwin.obj,\
+               selstore.obj,\
                splitter.obj,\
-               statusbr.obj,\
                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
@@ -72,6 +73,7 @@ OBJECTS = \
                wizard.obj
 
 SOURCES = \
+               accel.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
@@ -83,10 +85,9 @@ SOURCES = \
                filedlgg.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\
+               gridctrl.cpp,\
+               gridsel.cpp,\
                helpext.cpp,\
-               helphtml.cpp,\
-               helpwxht.cpp,\
-               helpxlp.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
@@ -94,16 +95,13 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
+               paletteg.cpp,\
                panelg.cpp,\
-               plot.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\
                sashwin.cpp,\
-               scrolwin.cpp,\
+               selstore.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
@@ -116,11 +114,13 @@ SOURCES = \
                wizard.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statline.obj,\
-               notebook.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
-OBJECTS0=,filedlgg.obj
-
+.ifdef __WXUNIVERSAL__
+OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.else
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif
 .endif
 
 all : $(SOURCES)
@@ -129,10 +129,15 @@ all : $(SOURCES)
        library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+       library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0)
+.else
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
+.endif
 
+accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
@@ -144,10 +149,9 @@ dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
+gridctrl.obj : gridctrl.cpp
+gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
-helphtml.obj : helphtml.cpp
-helpwxht.obj : helpwxht.cpp
-helpxlp.obj : helpxlp.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
@@ -155,16 +159,15 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
+paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
-plot.obj : plot.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
-prop.obj : prop.cpp
-propform.obj : propform.cpp
-proplist.obj : proplist.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
 sashwin.obj : sashwin.cpp
-scrolwin.obj : scrolwin.cpp
+selstore.obj : selstore.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp