Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index f95426fa7db096db69a50a3ab99f85810f16e4d5..690964ef8779fe33e3e27a50bf98c581d1b4b68c 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
           /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
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -36,15 +43,16 @@ OBJECTS = \
                caret.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\
                caret.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\

+               datectlg.obj,\

                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\

+               fdrepdlg.obj,\

                fontdlgg.obj,\
                grid.obj,\
                fontdlgg.obj,\
                grid.obj,\

+               gridctrl.obj,\
+               gridsel.obj,\

                helpext.obj,\
                helpext.obj,\

-               helphtml.obj,\
-               helpwxht.obj,\
-               helpxlp.obj,\

                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\


@@ -54,15 +62,13 @@ OBJECTS = \
                panelg.obj,\
                printps.obj,\
                prntdlgg.obj,\
                panelg.obj,\
                printps.obj,\
                prntdlgg.obj,\

+               propdlg.obj,\

                progdlgg.obj,\
                progdlgg.obj,\

-               prop.obj,\
-               propform.obj,\
-               proplist.obj,\
+               renderg.obj,\

                sashwin.obj,\
                sashwin.obj,\

-               scrolwin.obj,\
+               scrlwing.obj,\
+               selstore.obj,\

                splitter.obj,\
                splitter.obj,\

-               statusbr.obj,\
-               tbarsmpl.obj,\

                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\


@@ -71,21 +77,23 @@ OBJECTS = \
                wizard.obj
 
 SOURCES = \
                wizard.obj
 
 SOURCES = \

+               accel.cpp,\

                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\

+               datectlg.cpp,\

                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\
                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\

+               fdrepdlg.cpp,\

                fontdlgg.cpp,\
                grid.cpp,\
                fontdlgg.cpp,\
                grid.cpp,\

+               gridctrl.cpp,\
+               gridsel.cpp,\

                helpext.cpp,\
                helpext.cpp,\

-               helphtml.cpp,\
-               helpwxht.cpp,\
-               helpxlp.cpp,\

                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\


@@ -93,32 +101,46 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               paletteg.cpp,\

                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\

+               propdlg.cpp,\

                progdlgg.cpp,\
                progdlgg.cpp,\

-               prop.cpp,\
-               propform.cpp,\
-               proplist.cpp,\
+               renderg.cpp,\

                sashwin.cpp,\
                sashwin.cpp,\

-               scrolwin.cpp,\
+               selstore.cpp,\

                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\
                splitter.cpp,\
                statline.cpp,\
                statusbr.cpp,\

-               tbarsmpl.cpp,\

                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
                treectlg.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__
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statline.obj,\
-               notebook.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj

 .else
 .else

-OBJECTS0=,filedlgg.obj
-
+.ifdef __WXX11__
+OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
+       listbkg.obj,mdig.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)
 .endif
 
 all : $(SOURCES)


@@ -128,24 +150,30 @@ all : $(SOURCES)
 .else
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .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
 
 .endif
 .endif
 

+accel.obj : accel.cpp

 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp

+datectlg.obj : datectlg.cpp

 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp

+fdrepdlg.obj : fdrepdlg.cpp

 grid.obj : grid.cpp
 grid.obj : grid.cpp

+gridctrl.obj : gridctrl.cpp
+gridsel.obj : gridsel.cpp

 helpext.obj : helpext.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
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp


@@ -153,22 +181,34 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp

+paletteg.obj : paletteg.cpp

 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 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
+propdlg.obj : propdlg.cpp
+scrlwing.obj : scrlwing.cpp
+spinctlg.obj : spinctlg.cpp
+renderg.obj : renderg.cpp

 sashwin.obj : sashwin.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
 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
 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