wx-config2.6

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 46e620cf1d100d88ea70fab9ae5aee7830e635d7..791e888a4da081b25d3cf1cdad6527bcde73bdf8 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -5,7 +5,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 //
@@ -180,7 +180,6 @@ static wxWindow*                    gpWinBeingCreated = NULL;
 BEGIN_EVENT_TABLE(wxWindowOS2, wxWindowBase)
     EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
     EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
-    EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog)
     EVT_IDLE(wxWindowOS2::OnIdle)
     EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
 END_EVENT_TABLE()
@@ -1955,10 +1954,18 @@ bool wxWindowOS2::DoPopupMenu(
 
     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
-
-    DoClientToScreen( &nX
-                     ,&nY
-                    );
+    
+    if ( x == -1 && y == -1 )
+    {
+        wxPoint mouse = wxGetMousePosition();
+        nX = mouse.x; nY = mouse.y;
+    }
+    else
+    {
+        DoClientToScreen( &nX
+                         ,&nY
+                        );
+    }
     wxCurrentPopupMenu = pMenu;
 
     ::WinPopupMenu( hWndParent
@@ -4353,7 +4360,7 @@ void wxWindowOS2::MoveChildren(
                               ,vSwp.y - nDiff
                               ,vSwp.cx
                               ,vSwp.cy
-                              ,SWP_MOVE | SWP_SHOW | SWP_ZORDER
+                              ,SWP_MOVE
                              );
             ::WinQueryWindowPos(GetHwndOf(pWin), pWin->GetSwp());
             if (pWin->IsKindOf(CLASSINFO(wxRadioBox)))