Let wxToolBar assume that no orientation flag means horizontal.

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

diff --git a/src/html/descrip.mms b/src/html/descrip.mms
index 081d0bca6b93e30a9ff7ac6bfd8f8277f09702bb..c03594367b47f2936eb76ae51d984d5caf3c2c31 100644 (file)
--- a/src/html/descrip.mms
+++ b/src/html/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__
 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
 CXX_DEFINE =
 CC_DEFINE =
 .else
 CXX_DEFINE =
 CC_DEFINE =


@@ -48,9 +55,13 @@ all : $(SOURCES)
        library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__
        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
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 .endif
 .endif

+.endif

 
 helpctrl.obj : helpctrl.cpp
 helpdata.obj : helpdata.cpp
 
 helpctrl.obj : helpctrl.cpp
 helpdata.obj : helpdata.cpp