reverting drawing code

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

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index c2e9985e9e713d4b1a61a3619d0322b5f3f07f17..0321fb2e4d21bf38de3a082ffa6103230b728d19 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -8,29 +8,30 @@
 .first
        define wx [--.include.wx]
 
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
+.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)/iee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
+.endif
 
 .suffixes : .cpp
 
 .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 = \
-       accel.obj,\
        app.obj,\
        bitmap.obj,\
-        bmpbuttn.obj,\
        brush.obj,\
-       button.obj,\
-       checkbox.obj,\
-       checklst.obj,\
-       choice.obj,\
        clipbrd.obj,\
        colour.obj,\
-        combobox.obj,\
-       control.obj,\
        cursor.obj,\
        data.obj,\
        dataobj.obj,\
@@ -38,29 +39,48 @@ OBJECTS = \
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\
-       dialog.obj,\
         dnd.obj,\
+        evtloop.obj,\
        font.obj,\
-       fontdlg.obj,\
-       frame.obj,\
-       gauge.obj,\
        gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
         icon.obj,\
-       listbox.obj,\
        main.obj,\
+       minifram.obj,\
+       pen.obj,\
+       popupwin.obj,\
+       renderer.obj,\
+       region.obj,\
+       settings.obj,\
+       timer.obj,\
+       tooltip.obj,\
+       toplevel.obj,\
+       utilsgtk.obj,\
+       utilsres.obj,\
+        win_gtk.obj,\
+       window.obj
+
+OBJECTS0= \
+        bmpbuttn.obj,\
+       button.obj,\
+       checkbox.obj,\
+       checklst.obj,\
+       choice.obj,\
+        combobox.obj,\
+       control.obj,\
+       dialog.obj,\
+       fontdlg.obj,\
+       frame.obj,\
+       gauge.obj,\
+       listbox.obj,\
        mdi.obj,\
        menu.obj,\
-       minifram.obj,\
        notebook.obj,\
-       palette.obj,\
-       pen.obj,\
        radiobox.obj,\
        radiobut.obj,\
-       region.obj,\
        scrolbar.obj,\
-       settings.obj,\
+       scrolwin.obj,\
        slider.obj,\
         spinbutt.obj,\
        spinctrl.obj,\
@@ -70,15 +90,10 @@ OBJECTS = \
        stattext.obj,\
        tbargtk.obj,\
        textctrl.obj,\
-       timer.obj,\
-       tooltip.obj,\
-       utilsgtk.obj,\
-       utilsres.obj,\
-        win_gtk.obj,\
-       window.obj
+       tglbtn.obj,\
+       msgdlg.obj
 
 SOURCES =\
-       accel.cpp,\
        app.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\
@@ -100,6 +115,7 @@ SOURCES =\
        dcscreen.cpp,\
        dialog.cpp,\
         dnd.cpp,\
+        evtloop.cpp,\
        font.cpp,\
        fontdlg.cpp,\
        frame.cpp,\
@@ -113,13 +129,16 @@ SOURCES =\
        mdi.cpp,\
        menu.cpp,\
        minifram.cpp,\
+       msgdlg.cpp,\
        notebook.cpp,\
-       palette.cpp,\
        pen.cpp,\
+       popupwin.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
+       renderer.cpp,\
        region.cpp,\
        scrolbar.cpp,\
+       scrolwin.cpp,\
        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\
@@ -130,8 +149,10 @@ SOURCES =\
        stattext.cpp,\
        tbargtk.cpp,\
        textctrl.cpp,\
+       tglbtn.cpp,\
        timer.cpp,\
        tooltip.cpp,\
+       toplevel.cpp,\
        utilsgtk.cpp,\
        utilsres.cpp,\
         win_gtk.c,\
@@ -139,9 +160,14 @@ SOURCES =\
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+.ifdef __WXUNIVERSAL__
+       library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
+.else
        library [--.lib]libwx_gtk.olb $(OBJECTS)
+       $(MMS)$(MMSQUALIFIERS) $(OBJECTS0)
+       library [--.lib]libwx_gtk.olb $(OBJECTS0)
+.endif
 
-accel.obj : accel.cpp
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
@@ -163,6 +189,7 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
+evtloop.obj : evtloop.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
@@ -173,16 +200,19 @@ gsockgtk.obj : gsockgtk.c
 icon.obj : icon.cpp
 listbox.obj : listbox.cpp
 main.obj : main.cpp
+msgdlg.obj : msgdlg.cpp
 mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
-palette.obj : palette.cpp
 pen.obj : pen.cpp
+popupwin.obj : popupwin.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
+renderer.obj : renderer.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
+scrolwin.obj : scrolwin.cpp
 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
@@ -193,8 +223,10 @@ statline.obj : statline.cpp
 stattext.obj : stattext.cpp
 tbargtk.obj : tbargtk.cpp
 textctrl.obj : textctrl.cpp
+tglbtn.obj : tglbtn.cpp
 timer.obj : timer.cpp
 tooltip.obj : tooltip.cpp
+toplevel.obj : toplevel.cpp
 utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 win_gtk.obj : win_gtk.c