Removed notebook tab flicker.

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

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index c2e9985e9e713d4b1a61a3619d0322b5f3f07f17..c87ecab7ae8515c51008d3ef0ebb9865e7b24cf2 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -8,29 +8,30 @@
 .first
        define wx [--.include.wx]
 
 .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 :
 
 .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 = \
 
 OBJECTS = \

-       accel.obj,\

        app.obj,\
        bitmap.obj,\
        app.obj,\
        bitmap.obj,\

-        bmpbuttn.obj,\

        brush.obj,\
        brush.obj,\

-       button.obj,\
-       checkbox.obj,\
-       checklst.obj,\
-       choice.obj,\

        clipbrd.obj,\
        colour.obj,\
        clipbrd.obj,\
        colour.obj,\

-        combobox.obj,\
-       control.obj,\

        cursor.obj,\
        data.obj,\
        dataobj.obj,\
        cursor.obj,\
        data.obj,\
        dataobj.obj,\


@@ -38,29 +39,46 @@ OBJECTS = \
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\
        dcclient.obj,\
        dcmemory.obj,\
        dcscreen.obj,\

-       dialog.obj,\

         dnd.obj,\
        font.obj,\
         dnd.obj,\
        font.obj,\

-       fontdlg.obj,\
-       frame.obj,\
-       gauge.obj,\

        gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
         icon.obj,\
        gdiobj.obj,\
         glcanvas.obj,\
        gsockgtk.obj,\
         icon.obj,\

-       listbox.obj,\

        main.obj,\
        main.obj,\

+       minifram.obj,\
+       pen.obj,\
+       popupwin.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,\
        mdi.obj,\
        menu.obj,\

-       minifram.obj,\

        notebook.obj,\
        notebook.obj,\

-       palette.obj,\
-       pen.obj,\

        radiobox.obj,\
        radiobut.obj,\
        radiobox.obj,\
        radiobut.obj,\

-       region.obj,\

        scrolbar.obj,\
        scrolbar.obj,\

-       settings.obj,\
+       scrolwin.obj,\

        slider.obj,\
         spinbutt.obj,\
        spinctrl.obj,\
        slider.obj,\
         spinbutt.obj,\
        spinctrl.obj,\


@@ -70,15 +88,9 @@ OBJECTS = \
        stattext.obj,\
        tbargtk.obj,\
        textctrl.obj,\
        stattext.obj,\
        tbargtk.obj,\
        textctrl.obj,\

-       timer.obj,\
-       tooltip.obj,\
-       utilsgtk.obj,\
-       utilsres.obj,\
-        win_gtk.obj,\
-       window.obj
+       tglbtn.obj

 
 SOURCES =\
 
 SOURCES =\

-       accel.cpp,\

        app.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\
        app.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\


@@ -114,12 +126,13 @@ SOURCES =\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\

-       palette.cpp,\

        pen.cpp,\
        pen.cpp,\

+       popupwin.cpp,\

        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\

+       scrolwin.cpp,\

        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\
        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\


@@ -130,8 +143,10 @@ SOURCES =\
        stattext.cpp,\
        tbargtk.cpp,\
        textctrl.cpp,\
        stattext.cpp,\
        tbargtk.cpp,\
        textctrl.cpp,\

+       tglbtn.cpp,\

        timer.cpp,\
        tooltip.cpp,\
        timer.cpp,\
        tooltip.cpp,\

+       toplevel.cpp,\

        utilsgtk.cpp,\
        utilsres.cpp,\
         win_gtk.c,\
        utilsgtk.cpp,\
        utilsres.cpp,\
         win_gtk.c,\


@@ -139,9 +154,14 @@ SOURCES =\
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
    
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)

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

        library [--.lib]libwx_gtk.olb $(OBJECTS)
        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
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp


@@ -177,12 +197,13 @@ mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp

-palette.obj : palette.cpp

 pen.obj : pen.cpp
 pen.obj : pen.cpp

+popupwin.obj : popupwin.cpp

 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.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
 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp


@@ -193,8 +214,10 @@ statline.obj : statline.cpp
 stattext.obj : stattext.cpp
 tbargtk.obj : tbargtk.cpp
 textctrl.obj : textctrl.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
 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
 utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 win_gtk.obj : win_gtk.c