correct the tests for the window position to actually the display offset into account...

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index bc28d8708ec0a65104cc1a536330209f3a73311e..a5dab64013485b071354c2f62ee3ef7841ff878d 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -159,7 +159,7 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
     // is there enough space to put the popup below the window (where we put it
     // by default)?
     wxCoord y = ptOrigin.y + size.y;
     // is there enough space to put the popup below the window (where we put it
     // by default)?
     wxCoord y = ptOrigin.y + size.y;

-    if ( y + sizeSelf.y > sizeScreen.y )
+    if ( y + sizeSelf.y > posScreen.y + sizeScreen.y )

     {
         // check if there is enough space above
         if ( ptOrigin.y > sizeSelf.y )
     {
         // check if there is enough space above
         if ( ptOrigin.y > sizeSelf.y )


@@ -183,7 +183,7 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
         x += size.x;
 
 
         x += size.x;
 
 

-    if ( x + sizeSelf.x > sizeScreen.x )
+    if ( x + sizeSelf.x > posScreen.x + sizeScreen.x )

     {
         // check if there is enough space to the left
         if ( ptOrigin.x > sizeSelf.x )
     {
         // check if there is enough space to the left
         if ( ptOrigin.x > sizeSelf.x )