Don't call StartingKey if the key was F2

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

diff --git a/src/os2/popupwin.cpp b/src/os2/popupwin.cpp
index adc25e8f9cd7142de923794044823755e0d2629d..359210196040f39111171704b3f7078a3f3df625 100644 (file)
--- a/src/os2/popupwin.cpp
+++ b/src/os2/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     13.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Dave Webster <dwebster@bhmi.com>
 // Created:     13.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Dave Webster <dwebster@bhmi.com>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -62,6 +62,14 @@ void wxPopupWindow::DoGetPosition(
     GetParent()->ClientToScreen(pnX, pnY);
 } // end of wxPopupWindow::DoGetPosition
 
     GetParent()->ClientToScreen(pnX, pnY);
 } // end of wxPopupWindow::DoGetPosition
 

+WXHWND wxPopupWindow::OS2GetParent() const
+{
+    // we must be a child of the desktop to be able to extend beyond the parent
+    // window client area (like the comboboxes drop downs do)
+    //
+    return (WXHWND)HWND_DESKTOP;
+} // end of wxPopupWindow::OS2GetParent
+

 WXDWORD wxPopupWindow::OS2GetStyle(
   long                              lFlags
 , WXDWORD*                          dwExstyle
 WXDWORD wxPopupWindow::OS2GetStyle(
   long                              lFlags
 , WXDWORD*                          dwExstyle


@@ -74,3 +82,4 @@ WXDWORD wxPopupWindow::OS2GetStyle(
     return dwStyle;
 } // end of wxPopupWindow::OS2GetStyle
 
     return dwStyle;
 } // end of wxPopupWindow::OS2GetStyle
 

+