fixing the usage of hishape

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 395374ad6619762ac16f29c95c664abe7bb4d165..57ba86c0a00314f91dbcd0111c7fbdc282a7b5da 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -34,11 +34,11 @@
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
     #include "wx/log.h"
 #endif //WX_PRECOMP
 

+#include "wx/recguard.h"
+

 #ifdef __WXUNIVERSAL__
     #include "wx/univ/renderer.h"
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/renderer.h"

-#if wxUSE_SCROLLBAR

     #include "wx/scrolbar.h"
     #include "wx/scrolbar.h"

-#endif

 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__
 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__


@@ -151,7 +151,18 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
     }
 
     // now check left/right too
     }
 
     // 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
     if ( x + sizeSelf.x > sizeScreen.x )
     {
         // check if there is enough space to the left


@@ -563,6 +574,16 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 
 void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& 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->GetEventHandler()->ProcessEvent(event) )
     {
     // let the window have it first, it might process the keys
     if ( !m_popup->GetEventHandler()->ProcessEvent(event) )
     {