applied patch for compilation with gcc 3.0

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 664d0d2e00b220f03899e1c1b22a54a79dfcca20..f1aab5578052178e923f421590bd8de8ee90672c 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -9,8 +9,9 @@
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__
        define wx [--.include.wx]
 
 .ifdef __WXMOTIF__

-CXX_DEFINE = /define=(__WXMOTIF__=1)
-CC_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__
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 .else
 .ifdef __WXGTK__
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\


@@ -51,7 +52,6 @@ OBJECTS = \
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                panelg.obj,\

-               plot.obj,\

                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\
                printps.obj,\
                prntdlgg.obj,\
                progdlgg.obj,\


@@ -66,6 +66,7 @@ OBJECTS = \
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\

+               tipwin.obj,\

                treectlg.obj,\
                wizard.obj
 
                treectlg.obj,\
                wizard.obj
 


@@ -92,8 +93,8 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               paletteg.cpp,\

                panelg.cpp,\
                panelg.cpp,\

-               plot.cpp,\

                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                progdlgg.cpp,\


@@ -109,6 +110,7 @@ SOURCES = \
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tabg.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\

+               tipwin.cpp,\

                treectlg.cpp,\
                wizard.cpp
 
                treectlg.cpp,\
                wizard.cpp
 


@@ -116,8 +118,7 @@ SOURCES = \
 OBJECTS0=,statline.obj,\
                notebook.obj
 .else
 OBJECTS0=,statline.obj,\
                notebook.obj
 .else

-OBJECTS0=,filedlgg.obj
-
+OBJECTS0=,filedlgg.obj,paletteg.obj

 .endif
 
 all : $(SOURCES)
 .endif
 
 all : $(SOURCES)


@@ -152,8 +153,8 @@ 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
 panelg.obj : panelg.cpp

-plot.obj : plot.cpp

 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp


@@ -169,5 +170,6 @@ tbarsmpl.obj : tbarsmpl.cpp
 tabg.obj : tabg.cpp
 textdlgg.obj : textdlgg.cpp
 tipdlg.obj : tipdlg.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
 treectlg.obj : treectlg.cpp
 wizard.obj : wizard.cpp