backported crash fix for wxFrame::Iconize() from 2.2

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 86d20954dcbbf279d592154d61d38f5316f24065..8e938b9b24678ea5d54f46eadf4fa575c7aacfc1 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -201,6 +201,7 @@ COMMONOBJS = \
 !if "$(WXMAKINGDLL)" != "1"
 # don't have an ODBC database
   ..\common\$D\db.obj \
+  ..\common\$D\dbgrid.obj \
   ..\common\$D\dbtable.obj \
 !endif
   ..\common\$D\dcbase.obj \
@@ -316,6 +317,7 @@ COMLIBOBJS1 = \
   datetime.obj \
   datstrm.obj \
   db.obj \
+  dbgrid.obj \
   dbtable.obj \
   dcbase.obj \
   dircmn.obj \
@@ -346,10 +348,10 @@ COMLIBOBJS1 = \
   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \
-  hash.obj \
-  helpbase.obj
+  hash.obj
 
 COMLIBOBJS2 = \
+  helpbase.obj \
   http.obj \
   imagall.obj \
   imagbmp.obj \
@@ -390,10 +392,10 @@ COMLIBOBJS2 = \
   serbase.obj \
   sizer.obj \
   socket.obj \
-  strconv.obj \
-  stream.obj
+  strconv.obj
 
 COMLIBOBJS3 = \
+  stream.obj \
   string.obj \
   tbarbase.obj \
   textcmn.obj \
@@ -659,6 +661,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj
+  copy ..\common\$D\dbgrid.obj
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
@@ -690,9 +693,9 @@ $(COMLIBOBJS1):
   copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
-  copy ..\common\$D\helpbase.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
@@ -734,9 +737,9 @@ $(COMLIBOBJS2):
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\strconv.obj
-  copy ..\common\$D\stream.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj