Weekly Updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 56bb19ad2e80b4eaaac600d2f894a1ca4731c562..227d2dbbc946c7db5d0c9a6612c36267b88bbf4f 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -274,6 +274,7 @@ COMMONOBJS = \
   ..\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 \
@@ -411,12 +412,13 @@ COMLIBOBJS2 = \
   menucmn.obj \
   mimecmn.obj \
   module.obj \
+  msgout.obj \
   mstream.obj \
   nbkbase.obj \
-  object.obj \
-  odbc.obj
+  object.obj
 
 COMLIBOBJS3 = \
+  odbc.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \
@@ -458,10 +460,10 @@ COMLIBOBJS3 = \
   wincmn.obj \
   wxchar.obj \
   wxexpr.obj \
-  xpmdecod.obj \
-  y_tab.obj
+  xpmdecod.obj
 
 COMLIBOBJS4 = \
+  y_tab.obj \
   zipstrm.obj \
   zstream.obj
 
@@ -784,12 +786,13 @@ $(COMLIBOBJS2):
   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\odbc.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
@@ -832,9 +835,9 @@ $(COMLIBOBJS3):
   copy ..\common\$D\wxchar.obj
   copy ..\common\$D\wxexpr.obj
   copy ..\common\$D\xpmdecod.obj
-  copy ..\common\$D\y_tab.obj
 
 $(COMLIBOBJS4):
+  copy ..\common\$D\y_tab.obj
   copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
 

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index e41f21f386436e7e7542559bb6586bb8ea5b5d47..38cc1963b1bc202eca259167594f13089f0da6af 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -442,17 +442,19 @@ bool wxWindowOS2::Create(
     // Generic OS/2 Windows have no Control Data but other classes
     // that call OS2Create may have some.
     //
-    OS2Create( (PSZ)wxCanvasClassName
-              ,rName.c_str()
-              ,ulCreateFlags
-              ,rPos
-              ,rSize
-              ,NULL         // Control Data
-              ,dwExStyle
-              ,TRUE         // Child
-             );
+    bool                            bRetVal = OS2Create( (PSZ)wxCanvasClassName
+                                                        ,rName.c_str()
+                                                        ,ulCreateFlags
+                                                        ,rPos
+                                                        ,rSize
+                                                        ,NULL         // Control Data
+                                                        ,dwExStyle
+                                                        ,TRUE         // Child
+                                                       );
 
-    return(TRUE);
+    if (bRetVal)
+        ::WinSubclassWindow(m_hWnd, (PFNWP)wxWndProc);
+    return(bRetVal);
 } // end of wxWindowOS2::Create
 
 // ---------------------------------------------------------------------------

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index e927cf47aef4fdbe51510e99fd9ac782f76b7ab2..4ee3e22e9ecf08d3a18d06b9219732041e2272f1 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\WX.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -78,6 +78,8 @@ EXPORTS
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
+      ;wxAppBase::DoInit()
+      DoInit__9wxAppBaseFv
       ;wxOnAssert(const char*,int,const char*,const char*)
       wxOnAssert__FPCciN21
       ;wxAppBase::~wxAppBase()
@@ -201,6 +203,8 @@ EXPORTS
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv
+      ;wxCmdLineParser::GetUsageString()
+      GetUsageString__15wxCmdLineParserFv
       ;wxArrayParams::operator=(const wxArrayParams&)
       __as__13wxArrayParamsFRC13wxArrayParams
       ;wxArrayOptions::RemoveAt(unsigned int,unsigned int)
@@ -4325,6 +4329,20 @@ EXPORTS
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule
+  ;From object file:  ..\common\msgout.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxMessageOutputMessageBox::Printf(const char*,...)
+      Printf__25wxMessageOutputMessageBoxFPCce
+      ;wxMessageOutput::Get()
+      Get__15wxMessageOutputFv
+      ;wxMessageOutput::ms_msgOut
+      ms_msgOut__15wxMessageOutput
+      ;wxMessageOutput::Set(wxMessageOutput*)
+      Set__15wxMessageOutputFP15wxMessageOutput
+      __vft25wxMessageOutputMessageBox15wxMessageOutput
+      __vft21wxMessageOutputStderr15wxMessageOutput
+      ;wxMessageOutputStderr::Printf(const char*,...)
+      Printf__21wxMessageOutputStderrFPCce
   ;From object file:  ..\common\mstream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMemoryOutputStream::CopyTo(void*,unsigned int) const
@@ -9117,8 +9135,6 @@ EXPORTS
       SetItem__17wxGenericListCtrlFR10wxListItem
       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
-      ;wxGenericListCtrl::SetImageList(wxGenericImageList*,int)
-      SetImageList__17wxGenericListCtrlFP18wxGenericImageListi
       ;wxGenericListCtrl::SetColumnWidth(int,int)
       SetColumnWidth__17wxGenericListCtrlFiT1
       ;wxGenericListCtrl::ScrollList(int,int)
@@ -9211,8 +9227,8 @@ EXPORTS
       SetItem__16wxListHeaderDataFRC10wxListItem
       ;wxListMainWindow::SetItemState(long,long,long)
       SetItemState__16wxListMainWindowFlN21
-      ;wxListMainWindow::SetImageList(wxGenericImageList*,int)
-      SetImageList__16wxListMainWindowFP18wxGenericImageListi
+      ;wxListMainWindow::SetImageList(wxImageList*,int)
+      SetImageList__16wxListMainWindowFP11wxImageListi
       ;wxGenericListCtrl::SetColumn(int,wxListItem&)
       SetColumn__17wxGenericListCtrlFiR10wxListItem
       ;wxListMainWindow::SetColumnWidth(int,int)
@@ -9241,6 +9257,8 @@ EXPORTS
       DeleteColumn__17wxGenericListCtrlFi
       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi
+      ;wxGenericListCtrl::AssignImageList(wxImageList*,int)
+      AssignImageList__17wxGenericListCtrlFP11wxImageListi
       ;wxGenericListCtrl::GetNextItem(long,int,int) const
       GetNextItem__17wxGenericListCtrlCFliT2
       ;wxConstructorForwxListCtrl()
@@ -9362,8 +9380,6 @@ EXPORTS
       DrawImage__16wxListMainWindowFiP4wxDCN21
       ;wxListMainWindow::ChangeCurrent(unsigned int)
       ChangeCurrent__16wxListMainWindowFUi
-      ;wxGenericListCtrl::AssignImageList(wxGenericImageList*,int)
-      AssignImageList__17wxGenericListCtrlFP18wxGenericImageListi
       ;wxGenericListCtrl::~wxGenericListCtrl()
       __dt__17wxGenericListCtrlFv
       wxEVT_COMMAND_LIST_KEY_DOWN
@@ -9578,6 +9594,8 @@ EXPORTS
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
+      ;wxGenericListCtrl::SetImageList(wxImageList*,int)
+      SetImageList__17wxGenericListCtrlFP11wxImageListi
       ;wxListMainWindow::SetColumn(int,wxListItem&)
       SetColumn__16wxListMainWindowFiR10wxListItem
       ;wxListLineDataArray::RemoveAt(unsigned int,unsigned int)