cleanup in toplevel activation, and switching to native carbon event notification...

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

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 12a7b076300ee443781b6825ba87179366b86eda..f9f2137e87aeba6848c0fb2015a64f22a63b4f8c 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
 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
 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
+.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
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif

+.endif

 
 YACC=bison/yacc
 
 
 YACC=bison/yacc
 


@@ -48,6 +48,7 @@ OBJECTS = \
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\

+               bookctrl.obj,\

                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                clntdata.obj,\


@@ -98,6 +99,7 @@ OBJECTS1=fs_inet.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\
                helpbase.obj,\
                http.obj,\
                iconbndl.obj,\

+               init.obj,\

                imagall.obj,\
                imagbmp.obj,\
                image.obj,\
                imagall.obj,\
                imagbmp.obj,\
                image.obj,\


@@ -131,6 +133,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\

+               rendcmn.obj,\

                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\


@@ -163,20 +166,26 @@ OBJECTS2=utilscmn.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\
                valtext.obj,\
                variant.obj,\
                wfstream.obj,\

-               wincmn.obj,\

                wxchar.obj,\
                wxchar.obj,\

+               wincmn.obj,\

                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 
 OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 
                xpmdecod.obj,\
                zipstrm.obj,\
                zstream.obj
 
 OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj
 

+OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
+       dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
+       gbsizer.obj,geometry.obj,gzstream.obj,matrix.obj,radiocmn.obj,\
+       regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
+

 SOURCES = \
                appbase.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\
 SOURCES = \
                appbase.cpp,\
                appcmn.cpp,\
                artprov.cpp,\
                artstd.cpp,\
                bmpbase.cpp,\

+               bookctrl.cpp,\

                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\


@@ -227,6 +236,7 @@ SOURCES = \
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\
                helpbase.cpp,\
                http.cpp,\
                iconbndl.cpp,\

+               init.cpp,\

                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\
                imagall.cpp,\
                imagbmp.cpp,\
                image.cpp,\


@@ -260,6 +270,7 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\

+               rendcmn.cpp,\

                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\


@@ -295,7 +306,25 @@ SOURCES = \
                wxchar.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\
                wxchar.cpp,\
                xpmdecod.cpp,\
                zipstrm.cpp,\

-               zstream.cpp
+               zstream.cpp,\
+               accesscmn.cpp,\
+               dndcmn.cpp,\
+               dpycmn.cpp,\
+               dseldlg.cpp,\
+               dynload.cpp,\
+               effects.cpp,\
+               fddlgcmn.cpp,\
+               fs_mem.cpp,\
+               gbsizer.cpp,\
+               geometry.cpp,\
+               gzstream.cpp,\
+               matrix.cpp,\
+               radiocmn.cpp,\
+               regex.cpp,\
+               taskbarcmn.cpp,\
+               xti.cpp,\
+               xtistrm.cpp,\
+               xtixml.cpp

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)


@@ -309,14 +338,16 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__
        library [--.lib]libwx_motif.olb $(OBJECTS_MOTIF)
 .else
 .ifdef __WXGTK__

-.ifdef __WXUNIVERSAL__
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS1)
-       library [--.lib]libwx_gtk_univ.olb $(OBJECTS2)
-.else

        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS1)
        library [--.lib]libwx_gtk.olb $(OBJECTS2)

+.else
+.ifdef __WXX11__
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
+       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)

 .endif
 .endif
 .endif
 .endif
 .endif
 .endif


@@ -326,6 +357,7 @@ appcmn.obj : appcmn.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 bmpbase.obj : bmpbase.cpp
 artprov.obj : artprov.cpp
 artstd.obj : artstd.cpp
 bmpbase.obj : bmpbase.cpp

+bookctrl.obj : bookctrl.cpp

 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp
 choiccmn.obj : choiccmn.cpp
 clipcmn.obj : clipcmn.cpp
 clntdata.obj : clntdata.cpp


@@ -376,6 +408,7 @@ hashmap.obj : hashmap.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.cpp
 helpbase.obj : helpbase.cpp
 http.obj : http.cpp
 iconbndl.obj : iconbndl.cpp

+init.obj : init.cpp

 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp
 imagall.obj : imagall.cpp
 imagbmp.obj : imagbmp.cpp
 image.obj : image.cpp


@@ -409,6 +442,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp

+rendcmn.obj : rendcmn.cpp

 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp


@@ -445,3 +479,21 @@ wxchar.obj : wxchar.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
 xpmdecod.obj : xpmdecod.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp

+accesscmn.obj : accesscmn.cpp
+dndcmn.obj : dndcmn.cpp
+dpycmn.obj : dpycmn.cpp
+dseldlg.obj : dseldlg.cpp
+dynload.obj : dynload.cpp
+effects.obj : effects.cpp
+fddlgcmn.obj : fddlgcmn.cpp
+fs_mem.obj : fs_mem.cpp
+gbsizer.obj : gbsizer.cpp
+geometry.obj : geometry.cpp
+gzstream.obj : gzstream.cpp
+matrix.obj : matrix.cpp
+radiocmn.obj : radiocmn.cpp
+regex.obj : regex.cpp
+taskbarcmn.obj : taskbarcmn.cpp
+xti.obj : xti.cpp
+xtistrm.obj : xtistrm.cpp
+xtixml.obj : xtixml.cpp