no message

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

src/os2/app.cpp

@@ -478,12 +478,11 @@ int wxEntry(
     {
         if (wxTheApp->OnInit())
         {
-            nRetValue = -1;
+            nRetValue = wxTheApp->OnRun();
+//          nRetValue = -1;
         }
     }
 
-    if (nRetValue == 0)
-    {
     wxWindow*                       pTopWindow = wxTheApp->GetTopWindow();
 
     if (pTopWindow)
@@ -501,7 +500,6 @@ int wxEntry(
             wxTheApp->SetTopWindow(NULL);
         }
     }
-    }
     wxTheApp->OnExit();
     wxApp::CleanUp();
     return(nRetValue);

src/os2/frame.cpp

@@ -344,6 +344,14 @@ void wxFrame::DoShowWindow(
 {
     HWND                            hClient;
 
+    //
+    // Send anything to initialize the frame
+    //
+    ::WinSendMsg( GetHwnd()
+                 ,WM_UPDATEFRAME
+                 ,(MPARAM)FCF_MENU
+                 ,(MPARAM)0
+                );
     hClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
     ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
     ::WinShowWindow(hClient, (BOOL)bShowCmd);
@@ -898,6 +906,7 @@ bool wxFrame::OS2Create(
                            ,SWP_SIZE | SWP_MOVE
                           ))
         return FALSE;
+    WinQueryWindowPos(hClient, &vSwp);
     return TRUE;
 } // end of wxFrame::OS2Create