Checked for stream validity in wxImage::GetImageCount.

[wxWidgets.git] / src / os2 / makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 46fd7ce9b00dc5076f3ac76b03205362ade6e726..e5001f5cfc4650e72585003a03ea6fa1f4899fd5 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -116,6 +116,7 @@ GENERICOBJS= \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\listctrl.obj \
   ..\generic\$D\logg.obj \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\listctrl.obj \
   ..\generic\$D\logg.obj \

+  ..\generic\$D\mdig.obj \

   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
   ..\generic\$D\printps.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
   ..\generic\$D\printps.obj \


@@ -162,6 +163,7 @@ GENLIBOBJS= \
   laywin.obj \
   listctrl.obj \
   logg.obj \
   laywin.obj \
   listctrl.obj \
   logg.obj \

+  mdig.obj \

   numdlgg.obj \
   panelg.obj \
   printps.obj \
   numdlgg.obj \
   panelg.obj \
   printps.obj \


@@ -274,6 +276,7 @@ COMMONOBJS = \
   ..\common\$D\menucmn.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\menucmn.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \

+  ..\common\$D\msgout.obj \

   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \


@@ -411,12 +414,13 @@ COMLIBOBJS2 = \
   menucmn.obj \
   mimecmn.obj \
   module.obj \
   menucmn.obj \
   mimecmn.obj \
   module.obj \

+  msgout.obj \

   mstream.obj \
   nbkbase.obj \
   mstream.obj \
   nbkbase.obj \

-  object.obj \
-  odbc.obj
+  object.obj

 
 COMLIBOBJS3 = \
 
 COMLIBOBJS3 = \

+  odbc.obj \

   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \


@@ -458,10 +462,10 @@ COMLIBOBJS3 = \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \

-  xpmdecod.obj \
-  y_tab.obj
+  xpmdecod.obj

 
 COMLIBOBJS4 = \
 
 COMLIBOBJS4 = \

+  y_tab.obj \

   zipstrm.obj \
   zstream.obj
 
   zipstrm.obj \
   zstream.obj
 


@@ -507,19 +511,16 @@ OS2OBJS = \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
   ..\os2\$D\main.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
   ..\os2\$D\main.obj \

-  ..\os2\$D\mdi.obj \

   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
   ..\os2\$D\mimetype.obj \
   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
   ..\os2\$D\mimetype.obj \

-  ..\os2\$D\minifram.obj \

   ..\os2\$D\msgdlg.obj \
   ..\os2\$D\nativdlg.obj \
   ..\os2\$D\notebook.obj \
   ..\os2\$D\ownerdrw.obj \
   ..\os2\$D\palette.obj \
   ..\os2\$D\pen.obj \
   ..\os2\$D\msgdlg.obj \
   ..\os2\$D\nativdlg.obj \
   ..\os2\$D\notebook.obj \
   ..\os2\$D\ownerdrw.obj \
   ..\os2\$D\palette.obj \
   ..\os2\$D\pen.obj \

-  ..\os2\$D\pnghand.obj \

   ..\os2\$D\popupwin.obj \
   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \
   ..\os2\$D\popupwin.obj \
   ..\os2\$D\print.obj \
   ..\os2\$D\radiobox.obj \


@@ -589,21 +590,18 @@ OS2LIBOBJS1 = \
   joystick.obj \
   listbox.obj \
   main.obj \
   joystick.obj \
   listbox.obj \
   main.obj \

-  mdi.obj \

   menu.obj \
   menuitem.obj \
   menu.obj \
   menuitem.obj \

-  metafile.obj
+  metafile.obj \
+  mimetype.obj

 
 OS2LIBOBJS2 = \
 
 OS2LIBOBJS2 = \

-  mimetype.obj \
-  minifram.obj \

   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \

-  pnghand.obj \

   popupwin.obj \
   print.obj \
   radiobox.obj \
   popupwin.obj \
   print.obj \
   radiobox.obj \


@@ -648,7 +646,6 @@ HTMLOBJS = \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_layout.obj \
   ..\html\$D\m_links.obj \
   ..\html\$D\m_list.obj \

-  ..\html\$D\m_meta.obj \

   ..\html\$D\m_pre.obj \
   ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \


@@ -671,7 +668,6 @@ HTMLLIBOBJS = \
   m_layout.obj \
   m_links.obj \
   m_list.obj \
   m_layout.obj \
   m_links.obj \
   m_list.obj \

-  m_meta.obj \

   m_pre.obj \
   m_style.obj \
   m_tables.obj \
   m_pre.obj \
   m_style.obj \
   m_tables.obj \


@@ -786,12 +782,13 @@ $(COMLIBOBJS2):
   copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj

+  copy ..\common\$D\msgout.obj

   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj

-  copy ..\common\$D\odbc.obj

 
 $(COMLIBOBJS3):
 
 $(COMLIBOBJS3):

+  copy ..\common\$D\odbc.obj

   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj


@@ -834,9 +831,9 @@ $(COMLIBOBJS3):
   copy ..\common\$D\wxchar.obj
   copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj
   copy ..\common\$D\wxchar.obj
   copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj

-  copy ..\common\$D\y_tab.obj

 
 $(COMLIBOBJS4):
 
 $(COMLIBOBJS4):

+  copy ..\common\$D\y_tab.obj

   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
 
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
 


@@ -861,6 +858,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\laywin.obj
   copy ..\generic\$D\listctrl.obj
   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\laywin.obj
   copy ..\generic\$D\listctrl.obj
   copy ..\generic\$D\logg.obj

+  copy ..\generic\$D\mdig.obj

   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
   copy ..\generic\$D\printps.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
   copy ..\generic\$D\printps.obj


@@ -900,7 +898,6 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_layout.obj
   copy ..\html\$D\m_links.obj
   copy ..\html\$D\m_list.obj

-  copy ..\html\$D\m_meta.obj

   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj


@@ -948,21 +945,18 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.obj
   copy ..\os2\$D\main.obj
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.obj
   copy ..\os2\$D\main.obj

-  copy ..\os2\$D\mdi.obj

   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj

+  copy ..\os2\$D\mimetype.obj

 
 $(OS2LIBOBJS2):
 
 $(OS2LIBOBJS2):

-  copy ..\os2\$D\mimetype.obj
-  copy ..\os2\$D\minifram.obj

   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj

-  copy ..\os2\$D\pnghand.obj

   copy ..\os2\$D\popupwin.obj
   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj
   copy ..\os2\$D\popupwin.obj
   copy ..\os2\$D\print.obj
   copy ..\os2\$D\radiobox.obj