Updates to keep OS/2 Frame apps from crashing on exit. Fixes WM_QUIT processing

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 98308cc88cb7d21d9de08f0a1ce491f9e92016fe..1b431f44435a3340619ff273972b30c2b589b2a2 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -175,7 +175,7 @@ wxFrame::~wxFrame()
 
         if (wxTheApp->GetExitOnFrameDelete())
         {
 
         if (wxTheApp->GetExitOnFrameDelete())
         {

-            ::WinPostMsg(GetHWND(), WM_QUIT, 0, 0);
+            ::WinPostMsg(NULL, WM_QUIT, 0, 0);

         }
     }
     wxModelessWindows.DeleteObject(this);
         }
     }
     wxModelessWindows.DeleteObject(this);

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 0573448e600f9e6ff69f6f1bbbcb283f9f65b19c..1618cb714a6889b56106e69be5a6215e5af669f5 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1881,7 +1881,7 @@ MRESULT wxWindow::OS2WindowProc(
         case WM_DESTROY:
              HandleDestroy();
              bProcessed = TRUE;
         case WM_DESTROY:
              HandleDestroy();
              bProcessed = TRUE;

-             delete this;
+//             delete this;

              break;
 
         case WM_MOVE:
              break;
 
         case WM_MOVE:


@@ -2426,7 +2426,7 @@ bool wxWindow::OS2Create(
     wxAssociateWinWithHandle((HWND)m_hWnd
                              ,this
                             );
     wxAssociateWinWithHandle((HWND)m_hWnd
                              ,this
                             );

-    // 
+    //

     // Now need to subclass window.
     //
 
     // Now need to subclass window.
     //