fixed bug in SetStyle() which wouldn't reset the slant if it had been set before

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

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 3370b6debad05e8da1b09ac268988f569badb52e..2b3d08c45291aa03ca67ce858536269bddfec736 100644 (file)
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -9,9 +9,25 @@
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__

-CXX_DEFINE = /define=(__WXMOTIF__=1)
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+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 =
 .else
 CXX_DEFINE =

+CC_DEFINE =
+.endif

 .endif
 
 .suffixes : .cpp
 .endif
 
 .suffixes : .cpp


@@ -19,33 +35,50 @@ CXX_DEFINE =
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :
 .cpp.obj :
        cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 .c.obj :

-       cc $(CFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).c
+       cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c

 
 OBJECTS = \
                dialup.obj,\
 
 OBJECTS = \
                dialup.obj,\

+               dir.obj,\

                fontenum.obj,\
                fontutil.obj,\
                gsocket.obj,\
                fontenum.obj,\
                fontutil.obj,\
                gsocket.obj,\

+               mimetype.obj,\

                threadpsx.obj,\
                threadpsx.obj,\

-               utilsunx.obj
+               utilsunx.obj,\
+               utilsx11.obj

 
 SOURCES = \
                dialup.cpp,\
 
 SOURCES = \
                dialup.cpp,\

+               dir.cpp,\

                fontenum.cpp,\
                fontutil.cpp,\
                gsocket.c,\
                fontenum.cpp,\
                fontutil.cpp,\
                gsocket.c,\

+               mimetype.cpp,\

                threadpsx.cpp,\
                threadpsx.cpp,\

-               utilsunx.cpp
+               utilsunx.cpp,\
+               utilsx11.cpp

 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXMOTIF__
        library [--.lib]libwx_motif.olb $(OBJECTS)
 
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXMOTIF__
        library [--.lib]libwx_motif.olb $(OBJECTS)

+.else
+.ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+.else
+       library [--.lib]libwx_gtk.olb $(OBJECTS)
+.endif
+.endif

 .endif
 
 dialup.obj : dialup.cpp
 .endif
 
 dialup.obj : dialup.cpp

+dir.obj : dir.cpp

 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
 gsocket.obj : gsocket.c
 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
 gsocket.obj : gsocket.c

+mimetype.obj : mimetype.cpp

 threadpsx.obj : threadpsx.cpp
 utilsunx.obj : utilsunx.cpp
 threadpsx.obj : threadpsx.cpp
 utilsunx.obj : utilsunx.cpp

+utilsx11.obj : utilsx11.cpp