Some OS/2 catching up.

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

diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp
index 37b17ad0185aee7f6744ba3a29f977791955e259..800232b1528ceffb060be1cc7421632b34889677 100644 (file)
--- a/src/os2/mdi.cpp
+++ b/src/os2/mdi.cpp
@@ -138,6 +138,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     wxTopLevelWindows.Append(this);
 
   SetName(name);
+  wxWindowBase::Show(TRUE); // MDI child frame starts off shown
   m_windowStyle = style;
 
   if (parent) parent->AddChild(this);

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index b28ef6f918a02bc565472832a7a80986f9cfa323..a4531b6a12b420b56941ca814baac0782592fe8e 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -131,7 +131,8 @@ bool wxGetUserName(
 
 int wxKill(
   long                              lPid
-, int                               nSig
+, wxSignal                          eSig
+, wxKillError*                      peError
 )
 {
     return((int)::DosKillProcess(0, (PID)lPid));

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 7349f147d6594cc042905fb4861aaea3f2eca222..66638bb673e43ead23adf9ca5d2ac9eb55de39d9 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -14344,8 +14344,8 @@ EXPORTS
       wxGetUserName__FPci
       ;wxSleep(int)
       wxSleep__Fi
-      ;wxKill(long,int)
-      wxKill__Fli
+      ;wxKill(long,wxSignal,wxKillError*)
+      wxKill__Fl8wxSignalP11wxKillError
       ;wxGetResource(const wxString&,const wxString&,long*,const wxString&)
       wxGetResource__FRC8wxStringT1PlT1
       ;wxGetOsVersion(int*,int*)