updated wxExecute checks in wxGTK to be same as in other Unix ports after recent...

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index de7f0683b69446fcef08a512ed675d2cd6071879..57ba86c0a00314f91dbcd0111c7fbdc282a7b5da 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -34,8 +34,11 @@
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
+#include "wx/recguard.h"
+
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/renderer.h"
+    #include "wx/scrolbar.h"
 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__
@@ -148,7 +151,18 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
     }
 
     // now check left/right too
-    wxCoord x = ptOrigin.x + size.x;
+    wxCoord x = ptOrigin.x;
+            
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        // shift the window to the left instead of the right.
+        x -= size.x;
+        x -= sizeSelf.x;        // also shift it by window width.
+    }
+    else
+        x += size.x;
+
+    
     if ( x + sizeSelf.x > sizeScreen.x )
     {
         // check if there is enough space to the left
@@ -373,7 +387,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
         wxPoint pos = ScreenToClient(wxGetMousePosition());
         wxRect rect(GetSize());
 
-        if ( rect.Inside(pos) )
+        if ( rect.Contains(pos) )
         {
             if ( m_child->HasCapture() )
             {
@@ -560,8 +574,18 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 
 void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 {
+    // we can be associated with the popup itself in which case we should avoid
+    // infinite recursion
+    static int s_inside;
+    wxRecursionGuard guard(s_inside);
+    if ( guard.IsInside() )
+    {
+        event.Skip();
+        return;
+    }
+
     // let the window have it first, it might process the keys
-    if ( !m_popup->ProcessEvent(event) )
+    if ( !m_popup->GetEventHandler()->ProcessEvent(event) )
     {
         // by default, dismiss the popup
         m_popup->DismissAndNotify();