don't crash trying to dereference NULL m_selection (happens when showing a grid witho...

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 00474ef5795cd056385bd5d6be9e1e8976f13b3f..ccee2b72ea3f6f6b8707bf9b2e2cf643dc9cb932 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/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__
+.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 =
 CC_DEFINE =
@@ -45,7 +52,6 @@ OBJECTS = \
                gridsel.obj,\
                helpext.obj,\
                helphtml.obj,\
-               helpwxht.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
@@ -61,7 +67,6 @@ OBJECTS = \
                proplist.obj,\
                sashwin.obj,\
                splitter.obj,\
-               statusbr.obj,\
                tbarsmpl.obj,\
                tabg.obj,\
                textdlgg.obj,\
@@ -87,7 +92,6 @@ SOURCES = \
                gridsel.cpp,\
                helpext.cpp,\
                helphtml.cpp,\
-               helpwxht.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                listctrl.cpp,\
@@ -116,9 +120,13 @@ SOURCES = \
                wizard.cpp
 
 .ifdef __WXMOTIF__
-OBJECTS0=,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
 .else
+.ifdef __WXUNIVERSAL__
 OBJECTS0=,accel.obj,filedlgg.obj,paletteg.obj
+.else
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+.endif
 .endif
 
 all : $(SOURCES)
@@ -127,9 +135,13 @@ all : $(SOURCES)
        library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
+.ifdef __WXUNIVERSAL__
+       library/crea [--.lib]libwx_gtk_univ.olb $(OBJECTS)$(OBJECTS0)
+.else
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
+.endif
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
@@ -147,7 +159,6 @@ 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