check that the bitmap is valid before getting its size to avoid asserts

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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 3ae317bf36bead640741079eeb204d2fae660f93..9618cb9ee7182bc53270afbb1b16334d4b692630 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *

-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 9 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 19 September 2006                                                   *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -24,11 +24,18 @@ CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)
 .else
 CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
        /name=(as_is,short)
 .else

+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WX_GTK__=1,VMS_GTK2==1)/float=ieee\
+       /name=(as_is,short)
+.else

 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 .endif
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
 .endif

+.endif

 
 .suffixes : .cpp
 
 
 .suffixes : .cpp
 


@@ -41,64 +48,85 @@ OBJECTS = \
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\
                busyinfo.obj,\
                calctrl.obj,\
                caret.obj,\

+               choicbkg.obj,\

                choicdgg.obj,\
                colrdlgg.obj,\
                choicdgg.obj,\
                colrdlgg.obj,\

+               clrpickerg.obj,\
+               datectlg.obj,\

                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\
                dcpsg.obj,\
                dirctrlg.obj,\
                dirdlgg.obj,\

+               fdrepdlg.obj,\

                fontdlgg.obj,\
                fontdlgg.obj,\

+               fontpickerg.obj,\

                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\
                grid.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
                imaglist.obj,\
                laywin.obj,\

+               listbkg.obj,\

                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\
                listctrl.obj,\
                logg.obj,\
                msgdlgg.obj,\
                numdlgg.obj,\

+               odcombo.obj,\

                panelg.obj,\
                printps.obj,\
                prntdlgg.obj,\
                panelg.obj,\
                printps.obj,\
                prntdlgg.obj,\

+               propdlg.obj,\

                progdlgg.obj,\
                renderg.obj,\
                sashwin.obj,\
                progdlgg.obj,\
                renderg.obj,\
                sashwin.obj,\

+               scrlwing.obj,\

                selstore.obj,\
                splitter.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\
                selstore.obj,\
                splitter.obj,\
                tabg.obj,\
                textdlgg.obj,\
                tipdlg.obj,\
                tipwin.obj,\

+               toolbkg.obj,\
+               treebkg.obj,\

                treectlg.obj,\
                treectlg.obj,\

-               wizard.obj
+               wizard.obj,\
+               hyperlink.obj,\
+               filepickerg.obj

 
 SOURCES = \
                accel.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\
 
 SOURCES = \
                accel.cpp,\
                busyinfo.cpp,\
                calctrl.cpp,\
                caret.cpp,\

+               choicbkg.cpp,\

                choicdgg.cpp,\
                colrdlgg.cpp,\
                choicdgg.cpp,\
                colrdlgg.cpp,\

+               clrpickerg.cpp,\
+               datectlg.cpp,\

                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\
                dcpsg.cpp,\
                dirctrlg.cpp,\
                dirdlgg.cpp,\
                filedlgg.cpp,\

+               fdrepdlg.cpp,\

                fontdlgg.cpp,\
                fontdlgg.cpp,\

+               fontpickerg.cpp,\

                grid.cpp,\
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\
                grid.cpp,\
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
                imaglist.cpp,\
                laywin.cpp,\

+               listbkg.cpp,\

                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                listctrl.cpp,\
                logg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               odcombo.cpp,\

                paletteg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                paletteg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\

+               propdlg.cpp,\

                progdlgg.cpp,\
                renderg.cpp,\
                sashwin.cpp,\
                progdlgg.cpp,\
                renderg.cpp,\
                sashwin.cpp,\


@@ -110,6 +138,8 @@ SOURCES = \
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\
                textdlgg.cpp,\
                tipdlg.cpp,\
                tipwin.cpp,\

+               toolbkg.cpp,\
+               treebkg.cpp,\

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


@@ -122,17 +152,21 @@ SOURCES = \
                splash.cpp,\
                timer.cpp,\
                vlbox.cpp,\
                splash.cpp,\
                timer.cpp,\
                vlbox.cpp,\

-               vscroll.cpp
+               hyperlink.cpp,\
+               filepickerg.cpp,\
+               vscroll.cpp,\
+               icon.cpp

 
 .ifdef __WXMOTIF__
 
 .ifdef __WXMOTIF__

-OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,scrlwing.obj,spinctlg.obj
+OBJECTS0=,statusbr.obj,statline.obj,notebook.obj,spinctlg.obj

 .else
 .ifdef __WXX11__
 OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\
 .else
 .ifdef __WXX11__
 OBJECTS0=,accel.obj,filedlgg.obj,dragimgg.obj,fdrepdlg.obj,htmllbox.obj,\

-       listbkg.obj,mdig.obj,scrlwing.obj,spinctlg.obj,splash.obj,timer.obj,\
-       vlbox.obj,vscroll.obj
+       listbkg.obj,mdig.obj,spinctlg.obj,splash.obj,timer.obj,\
+       vlbox.obj,vscroll.obj,combog.obj,icon.obj

 .else
 .else

-OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj
+OBJECTS0=,accel.obj,statusbr.obj,filedlgg.obj,paletteg.obj,vlbox.obj,\
+       vscroll.obj,combog.obj,icon.obj

 .endif
 .endif
 
 .endif
 .endif
 


@@ -144,27 +178,35 @@ all : $(SOURCES)
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
        library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .else

+.ifdef __WXGTK2__
+       library/crea [--.lib]libwx_gtk2.olb $(OBJECTS)$(OBJECTS0)
+.else

 .ifdef __WXX11__
        library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif
 .ifdef __WXX11__
        library/crea [--.lib]libwx_x11_univ.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 .endif

+.endif

 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp
 
 accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
 choicdgg.obj : choicdgg.cpp

+clrpickerg.obj : clrpickerg.cpp

 colrdlgg.obj : colrdlgg.cpp
 colrdlgg.obj : colrdlgg.cpp

+datectlg.obj : datectlg.cpp

 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 dcpsg.obj : dcpsg.cpp
 dirctrlg.obj : dirctrlg.cpp
 dirdlgg.obj : dirdlgg.cpp
 filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp

+fdrepdlg.obj : fdrepdlg.cpp

 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp
 grid.obj : grid.cpp
 gridctrl.obj : gridctrl.cpp
 gridsel.obj : gridsel.cpp
 helpext.obj : helpext.cpp

+icon.obj : icon.cpp

 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp
 imaglist.obj : imaglist.cpp
 laywin.obj : laywin.cpp
 listctrl.obj : listctrl.cpp


@@ -172,11 +214,13 @@ 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

+odcombo.obj : odcombo.cpp

 paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp
 paletteg.obj : paletteg.cpp
 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 progdlgg.obj : progdlgg.cpp

+propdlg.obj : propdlg.cpp

 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp
 renderg.obj : renderg.cpp
 scrlwing.obj : scrlwing.cpp
 spinctlg.obj : spinctlg.cpp
 renderg.obj : renderg.cpp


@@ -202,3 +246,12 @@ splash.obj : splash.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.cpp
 timer.obj : timer.cpp
 vlbox.obj : vlbox.cpp
 vscroll.obj : vscroll.cpp

+       cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn vscroll.cpp
+listbkg.obj : listbkg.cpp
+choicbkg.obj : choicbkg.cpp
+toolbkg.obj : toolbkg.cpp
+treebkg.obj : treebkg.cpp
+combog.obj : combog.cpp
+fontpickerg.obj : fontpickerg.cpp
+hyperlink.obj : hyperlink.cpp
+filepickerg.obj : filepickerg.cpp