removed src/gtk/eggtrayicon.h

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 00474ef5795cd056385bd5d6be9e1e8976f13b3f..3ae317bf36bead640741079eeb204d2fae660f93 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -18,10 +18,17 @@ 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
 .else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+       /name=(as_is,short)
+.else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -44,8 +51,6 @@ OBJECTS = \
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
-               helphtml.obj,\
-               helpwxht.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
@@ -56,13 +61,10 @@ OBJECTS = \
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\
+               renderg.obj,\
                sashwin.obj,\
+               selstore.obj,\
                splitter.obj,\
-               statusbr.obj,\
-               tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
@@ -86,8 +88,6 @@ SOURCES = \
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
-               helphtml.cpp,\
-               helpwxht.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
@@ -100,25 +100,40 @@ SOURCES = \
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\
+               renderg.cpp,\
                sashwin.cpp,\
+               selstore.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
-               tbarsmpl.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
                treectlg.cpp,\
-               wizard.cpp
+               wizard.cpp,\
+               dragimgg.cpp,\
+               fdrepdlg.cpp,\
+               htmllbox.cpp,\
+               listbkg.cpp,\
+               mdig.cpp,\
+               scrlwing.cpp,\
+               spinctlg.cpp,\
+               splash.cpp,\
+               timer.cpp,\
+               vlbox.cpp,\
+               vscroll.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
-OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.ifdef __WXX11__
+OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
+       listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\
+       vlbox.obj,vscroll.obj
+.else
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif
 .endif
 
 all : $(SOURCES)
@@ -128,6 +143,10 @@ all : $(SOURCES)
 .else
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXX11__
+       library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
+.endif
 .endif
 .endif
 
@@ -146,8 +165,6 @@ grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
-helphtml.obj : helphtml.cpp
-helpwxht.obj : helpwxht.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
@@ -160,19 +177,28 @@ panelg.obj : panelg.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
+renderg.obj : renderg.cpp
 sashwin.obj : sashwin.cpp
+selstore.obj : selstore.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp
-tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.cpp
 tipwin.obj : tipwin.cpp
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp
+dragimgg.obj : dragimgg.cpp
+fdrepdlg.obj : fdrepdlg.cpp
+htmllbox.obj : htmllbox.cpp
+listbkg.obj : listbkg.cpp
+mdig.obj : mdig.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
+splash.obj : splash.cpp
+timer.obj : timer.cpp
+vlbox.obj : vlbox.cpp
+vscroll.obj : vscroll.cpp