Better placement of the AutoComplete listbox

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

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 0b4219617a2a15cd0fa42103df1b24e4e5d41d65..badfc618355142823be9e0c2b028482fb9accefa 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -36,6 +36,7 @@
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/control.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/control.h"

+    #include "wx/containr.h"        // wxSetFocusToChild()

 #endif //WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif //WX_PRECOMP
 
 #include "wx/os2/private.h"


@@ -83,9 +84,10 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd)
         case WM_INITDLG:
             //
             // For this message, returning TRUE tells system to set focus to
         case WM_INITDLG:
             //
             // For this message, returning TRUE tells system to set focus to

-            // the first control in the dialog box, but as we set the focus
-            // ourselves, we return FALSE from here as well, so fall through
+            // the first control in the dialog box, but we set the focus
+            // ourselves, however in OS/2 we must return true to enable the dialog

             //
             //

+            return (MRESULT)TRUE;

         default:
             //
             // For all the other ones, FALSE means that we didn't process the
         default:
             //
             // For all the other ones, FALSE means that we didn't process the


@@ -396,7 +398,7 @@ bool wxTopLevelWindowOS2::CreateDialog(
                       ,nY
                       ,nWidth
                       ,nHeight
                       ,nY
                       ,nWidth
                       ,nHeight

-                      ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW
+                      ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE

                      );
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;
                      );
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;


@@ -591,20 +593,50 @@ bool wxTopLevelWindowOS2::Create(
 
 wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
 {
 
 wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
 {

-    wxTopLevelWindows.DeleteObject(this);
+    if (this == m_spHiddenParent)
+    {
+        //
+        // Stop [infinite] recursion which would otherwise happen when we do
+        // "delete ms_hiddenParent" below -- and we're not interested in doing
+        // anything of the rest below for that window because the rest of
+        // wxWindows doesn't even know about it
+        //
+        return;
+    }

 
     if (wxModelessWindows.Find(this))
         wxModelessWindows.DeleteObject(this);
 
     //
 
     if (wxModelessWindows.Find(this))
         wxModelessWindows.DeleteObject(this);
 
     //

-    // If this is the last top-level window, exit.
+    // After destroying an owned window, Windows activates the next top level
+    // window in Z order but it may be different from our owner (to reproduce
+    // this simply Alt-TAB to another application and back before closing the
+    // owned frame) whereas we always want to yield activation to our parent
+    //
+    if (HasFlag(wxFRAME_FLOAT_ON_PARENT))
+    {
+        wxWindow*                   pParent = GetParent();
+
+        if (pParent)
+        {
+            ::WinSetWindowPos( GetHwndOf(pParent)
+                              ,HWND_TOP
+                              ,0, 0, 0, 0
+                              ,SWP_ZORDER
+                             );
+        }
+    }
+
+    //
+    // If this is the last top-level window, we're going to exit and we should
+    // delete ms_hiddenParent now to avoid leaking it

     //
     //

-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+    if (IsLastBeforeExit())

     {
     {

-        wxTheApp->SetTopWindow(NULL);
-        if ( wxTheApp->GetExitOnFrameDelete() )
+        if (m_spHiddenParent)

         {
         {

-            ::WinPostMsg(NULL, WM_QUIT, 0, 0);
+            delete m_spHiddenParent;
+            m_spHiddenParent = NULL;

         }
     }
 } // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2
         }
     }
 } // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2


@@ -721,15 +753,6 @@ bool wxTopLevelWindowOS2::Show(
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = vSwp.fl & SWP_MINIMIZE;
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = vSwp.fl & SWP_MINIMIZE;

-            if (hWndParent)
-                ::WinSetWindowPos( hWndParent
-                                  ,HWND_TOP
-                                  ,vSwp.x
-                                  ,vSwp.y
-                                  ,vSwp.cx
-                                  ,vSwp.cy
-                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE
-                                 );

             ::WinEnableWindow(hWndParent, TRUE);
         }
     }
             ::WinEnableWindow(hWndParent, TRUE);
         }
     }