Do not use Tooltips if they are disabled

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index d0a3534f37500fd1ee8ec719c5ede2de0bed9616..5b1a49504b47d644b9d8ed89d23e64213dc4991b 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -34,15 +34,20 @@
     #include "wx/log.h"
 #endif //WX_PRECOMP
 
     #include "wx/log.h"
 #endif //WX_PRECOMP
 

+#include "wx/display.h"
+#include "wx/recguard.h"
+

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

+    #include "wx/scrolbar.h"

 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__
     #include <gtk/gtk.h>

-#endif
-#ifdef __WXX11__
-#include "wx/x11/private.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/private.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/private.h"

 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)


@@ -71,7 +76,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)
+    wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);

 };
 
 class wxPopupFocusHandler : public wxEvtHandler
 };
 
 class wxPopupFocusHandler : public wxEvtHandler


@@ -87,7 +92,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)
+    wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -104,7 +109,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
 END_EVENT_TABLE()
     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
 END_EVENT_TABLE()


@@ -130,13 +135,31 @@ bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
 void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
                                  const wxSize& size)
 {
 void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
                                  const wxSize& size)
 {

-    wxSize sizeScreen = wxGetDisplaySize(),
-           sizeSelf = GetSize();
+    // determine the position and size of the screen we clamp the popup to
+    wxPoint posScreen;
+    wxSize sizeScreen;
+
+    const int displayNum = wxDisplay::GetFromPoint(ptOrigin);
+    if ( displayNum != wxNOT_FOUND )
+    {
+        const wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
+        posScreen = rectScreen.GetPosition();
+        sizeScreen = rectScreen.GetSize();
+    }
+    else // outside of any display?
+    {
+        // just use the primary one then
+        posScreen = wxPoint(0, 0);
+        sizeScreen = wxGetDisplaySize();
+    }
+
+
+    const wxSize sizeSelf = GetSize();

 
     // 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 )


@@ -148,8 +171,19 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
     }
 
     // now check left/right too
     }
 
     // now check left/right too

-    wxCoord x = ptOrigin.x + size.x;
-    if ( x + sizeSelf.x > sizeScreen.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 > 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 )


@@ -170,7 +204,7 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
 void wxPopupTransientWindow::Init()
 {
     m_child =
 void wxPopupTransientWindow::Init()
 {
     m_child =

-    m_focus = (wxWindow *)NULL;
+    m_focus = NULL;

 
     m_handlerFocus = NULL;
     m_handlerPopup = NULL;
 
     m_handlerFocus = NULL;
     m_handlerPopup = NULL;


@@ -237,7 +271,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     Show();
 
 
     Show();
 

-    // There is is a problem if these are still in use
+    // There is a problem if these are still in use

     wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
     wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 
     wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
     wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 


@@ -246,10 +280,18 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     m_child->PushEventHandler(m_handlerPopup);
 
 
     m_child->PushEventHandler(m_handlerPopup);
 

-    m_focus = winFocus ? winFocus : this;
-    m_focus->SetFocus();
+#if defined(__WXMSW__)
+    // Focusing on child of popup window does not work on MSW unless WS_POPUP
+    // style is set. We do not even want to try to set the focus, as it may
+    // provoke errors on some Windows versions (Vista and later).
+    if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP )
+#endif
+    {
+        m_focus = winFocus ? winFocus : this;
+        m_focus->SetFocus();
+    }

 
 

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON)

     // MSW doesn't allow to set focus to the popup window, but we need to
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     // MSW doesn't allow to set focus to the popup window, but we need to
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down


@@ -287,7 +329,7 @@ bool wxPopupTransientWindow::Show( bool show )
     }
 #endif
 
     }
 #endif
 

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

     if (!show && m_child && m_child->HasCapture())
     {
         m_child->ReleaseMouse();
     if (!show && m_child && m_child->HasCapture())
     {
         m_child->ReleaseMouse();


@@ -307,8 +349,8 @@ bool wxPopupTransientWindow::Show( bool show )
                              GDK_BUTTON_RELEASE_MASK |
                              GDK_POINTER_MOTION_HINT_MASK |
                              GDK_POINTER_MOTION_MASK),
                              GDK_BUTTON_RELEASE_MASK |
                              GDK_POINTER_MOTION_HINT_MASK |
                              GDK_POINTER_MOTION_MASK),

-                          (GdkWindow *) NULL,
-                          (GdkCursor *) NULL,
+                          NULL,
+                          NULL,

                           (guint32)GDK_CURRENT_TIME );
     }
 #endif
                           (guint32)GDK_CURRENT_TIME );
     }
 #endif


@@ -329,7 +371,7 @@ bool wxPopupTransientWindow::Show( bool show )
     }
 #endif
 
     }
 #endif
 

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

     if (show && m_child)
     {
         // Assume that the mouse is outside the popup to begin with
     if (show && m_child)
     {
         // Assume that the mouse is outside the popup to begin with


@@ -363,7 +405,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
     return false;
 }
 

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
     event.Skip();


@@ -441,7 +483,7 @@ void wxPopupComboWindow::OnDismiss()
 
 void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
 {

-    m_combo->ProcessEvent(event);
+    m_combo->ProcessWindowEvent(event);

 }
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 }
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -493,7 +535,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
                     winUnder->ScreenToClient(&event2.m_x, &event2.m_y);
 
                     event2.SetEventObject(winUnder);
                     winUnder->ScreenToClient(&event2.m_x, &event2.m_y);
 
                     event2.SetEventObject(winUnder);

-                    wxPostEvent(winUnder, event2);
+                    wxPostEvent(winUnder->GetEventHandler(), event2);

                 }
             }
             break;
                 }
             }
             break;


@@ -560,6 +602,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) )
     {