wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

[wxWidgets.git] / src / os2 / mdi.cpp

diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp
index b0142bab6835d5b9c4b64f1653631e9e1a60c808..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);
     wxTopLevelWindows.Append(this);
 
   SetName(name);

+  wxWindowBase::Show(TRUE); // MDI child frame starts off shown

   m_windowStyle = style;
 
   if (parent) parent->AddChild(this);
   m_windowStyle = style;
 
   if (parent) parent->AddChild(this);


@@ -996,7 +997,12 @@ MRESULT wxMDIChildFrame::OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPA
 
 bool wxMDIChildFrame::OS2TranslateMessage(WXMSG* msg)
 {
 
 bool wxMDIChildFrame::OS2TranslateMessage(WXMSG* msg)
 {

-    return m_acceleratorTable.Translate(GetParent(), msg);
+#if wxUSE_ACCEL
+    return m_acceleratorTable.Translate(GetParent()->GetHWND(), msg);
+#else
+    return FALSE;
+#endif  //wxUSE_ACCEL
+

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------