Fix tracking rectangles in 64-bit build by remembering the tag as the 64-bit integer...

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 79b3bbf23b96aa956a6ff7b48e15dd4342f1676a..57ba86c0a00314f91dbcd0111c7fbdc282a7b5da 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/popupcmn.cpp
+// Name:        src/common/popupcmn.cpp

 // Purpose:     implementation of wxPopupTransientWindow
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxPopupTransientWindow
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "popupwinbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,14 +29,16 @@
 #include "wx/popupwin.h"
 
 #ifndef WX_PRECOMP
 #include "wx/popupwin.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/combobox.h"        // wxComboControl
+    #include "wx/combobox.h"        // wxComboCtrl

     #include "wx/app.h"             // wxPostEvent
     #include "wx/log.h"
     #include "wx/app.h"             // wxPostEvent
     #include "wx/log.h"

-    #include "wx/app.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#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__
 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__


@@ -66,7 +64,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
 class wxPopupWindowHandler : public wxEvtHandler
 {
 public:
 class wxPopupWindowHandler : public wxEvtHandler
 {
 public:

-    wxPopupWindowHandler(wxPopupTransientWindow *popup) { m_popup = popup; }
+    wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -82,10 +80,7 @@ private:
 class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
 class wxPopupFocusHandler : public wxEvtHandler
 {
 public:

-    wxPopupFocusHandler(wxPopupTransientWindow *popup)
-    {
-        m_popup = popup;
-    }
+    wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

 
 protected:
     void OnKillFocus(wxFocusEvent& event);
 
 protected:
     void OnKillFocus(wxFocusEvent& event);


@@ -111,6 +106,12 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
     EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
 END_EVENT_TABLE()
 
     EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
 END_EVENT_TABLE()
 

+BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
+#ifdef __WXMSW__
+    EVT_IDLE(wxPopupTransientWindow::OnIdle)
+#endif
+END_EVENT_TABLE()
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -150,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


@@ -187,47 +199,41 @@ wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)
 
 wxPopupTransientWindow::~wxPopupTransientWindow()
 {
 
 wxPopupTransientWindow::~wxPopupTransientWindow()
 {

-    PopHandlers();
+    if (m_handlerPopup && m_handlerPopup->GetNextHandler())
+        PopHandlers();
+
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+    delete m_handlerFocus;
+    delete m_handlerPopup;

 }
 
 void wxPopupTransientWindow::PopHandlers()
 {
     if ( m_child )
     {
 }
 
 void wxPopupTransientWindow::PopHandlers()
 {
     if ( m_child )
     {

-        if ( m_handlerPopup && !m_child->RemoveEventHandler(m_handlerPopup) )
+        if ( !m_child->RemoveEventHandler(m_handlerPopup) )

         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time
             m_handlerPopup = NULL;
         }
         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time
             m_handlerPopup = NULL;
         }

-
-        // m_child->ReleaseMouse();
+        if (m_child->HasCapture())
+        {
+            m_child->ReleaseMouse();
+        }

         m_child = NULL;
     }
 
         m_child = NULL;
     }
 

-#ifdef __WXMSW__

     if ( m_focus )
     {
     if ( m_focus )
     {

-        if ( m_handlerFocus && !m_focus->RemoveEventHandler(m_handlerFocus) )
+        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )

         {
             // see above
             m_handlerFocus = NULL;
         }
     }
         {
             // see above
             m_handlerFocus = NULL;
         }
     }

-#else
-    if ( m_handlerFocus && !RemoveEventHandler(m_handlerFocus) )
-    {
-        // see above
-        m_handlerFocus = NULL;
-    }
-#endif
-
-    // delete the handlers, they'll be created as necessary in Popup()
-    delete m_handlerPopup;
-    m_handlerPopup = NULL;
-    delete m_handlerFocus;
-    m_handlerFocus = NULL;
-

     m_focus = NULL;
 }
 
     m_focus = NULL;
 }
 


@@ -245,10 +251,13 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     Show();
 
 
     Show();
 

-    delete m_handlerPopup;
-    m_handlerPopup = new wxPopupWindowHandler(this);
+    // There is is a problem if these are still in use
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+    if (!m_handlerPopup)
+        m_handlerPopup = new wxPopupWindowHandler(this);

 
 

-    // m_child->CaptureMouse();

     m_child->PushEventHandler(m_handlerPopup);
 
     m_focus = winFocus ? winFocus : this;
     m_child->PushEventHandler(m_handlerPopup);
 
     m_focus = winFocus ? winFocus : this;


@@ -259,21 +268,19 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();
     // subclass the window which has the focus, and not winFocus passed in or
     // otherwise everything else breaks down
     m_focus = FindFocus();

+#elif defined(__WXGTK__)
+    // GTK+ catches the activate events from the popup
+    // window, not the focus events from the child window
+    m_focus = this;
+#endif
+

     if ( m_focus )
     {
     if ( m_focus )
     {

-        delete m_handlerFocus;
-        m_handlerFocus = new wxPopupFocusHandler(this);
+        if (!m_handlerFocus)
+            m_handlerFocus = new wxPopupFocusHandler(this);

 
         m_focus->PushEventHandler(m_handlerFocus);
     }
 
         m_focus->PushEventHandler(m_handlerFocus);
     }

-#else
-    // GTK+ catches the activate events from the popup
-    // window, not the focus events from the child window
-    delete m_handlerFocus;
-    m_handlerFocus = new wxPopupFocusHandler(this);
-    PushEventHandler(m_handlerFocus);
-#endif // __WXMSW__
-

 }
 
 bool wxPopupTransientWindow::Show( bool show )
 }
 
 bool wxPopupTransientWindow::Show( bool show )


@@ -282,7 +289,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (!show)
     {
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
     if (!show)
     {
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );

-    
+

         gtk_grab_remove( m_widget );
     }
 #endif
         gtk_grab_remove( m_widget );
     }
 #endif


@@ -294,13 +301,20 @@ bool wxPopupTransientWindow::Show( bool show )
     }
 #endif
 
     }
 #endif
 

+#ifdef __WXMSW__
+    if (!show && m_child && m_child->HasCapture())
+    {
+        m_child->ReleaseMouse();
+    }
+#endif
+

     bool ret = wxPopupWindow::Show( show );
     bool ret = wxPopupWindow::Show( show );

-    
+

 #ifdef __WXGTK__
     if (show)
     {
         gtk_grab_add( m_widget );
 #ifdef __WXGTK__
     if (show)
     {
         gtk_grab_add( m_widget );

-        
+

         gdk_pointer_grab( m_widget->window, TRUE,
                           (GdkEventMask)
                             (GDK_BUTTON_PRESS_MASK |
         gdk_pointer_grab( m_widget->window, TRUE,
                           (GdkEventMask)
                             (GDK_BUTTON_PRESS_MASK |


@@ -317,7 +331,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (show)
     {
         Window xwindow = (Window) m_clientWindow;
     if (show)
     {
         Window xwindow = (Window) m_clientWindow;

-        
+

         /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
             True,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
         /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
             True,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,


@@ -328,20 +342,27 @@ bool wxPopupTransientWindow::Show( bool show )
             CurrentTime );
     }
 #endif
             CurrentTime );
     }
 #endif

+
+#ifdef __WXMSW__
+    if (show && m_child)
+    {
+        // Assume that the mouse is outside the popup to begin with
+        m_child->CaptureMouse();
+    }
+#endif
+

     return ret;
 }
 
 void wxPopupTransientWindow::Dismiss()
 {
     return ret;
 }
 
 void wxPopupTransientWindow::Dismiss()
 {

-    PopHandlers();
-

     Hide();
     Hide();

+    PopHandlers();

 }
 
 void wxPopupTransientWindow::DismissAndNotify()
 {
     Dismiss();
 }
 
 void wxPopupTransientWindow::DismissAndNotify()
 {
     Dismiss();

-

     OnDismiss();
 }
 
     OnDismiss();
 }
 


@@ -356,6 +377,35 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return false;
 }
 
     return false;
 }
 

+#ifdef __WXMSW__
+void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
+{
+    event.Skip();
+
+    if (IsShown() && m_child)
+    {
+        wxPoint pos = ScreenToClient(wxGetMousePosition());
+        wxRect rect(GetSize());
+
+        if ( rect.Contains(pos) )
+        {
+            if ( m_child->HasCapture() )
+            {
+                m_child->ReleaseMouse();
+            }
+        }
+        else
+        {
+            if ( !m_child->HasCapture() )
+            {
+                m_child->CaptureMouse();
+            }
+        }
+    }
+}
+#endif // __WXMSW__
+
+

 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------


@@ -366,13 +416,13 @@ BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
 END_EVENT_TABLE()
 
     EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
 END_EVENT_TABLE()
 

-wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
+wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent)

                   : wxPopupTransientWindow(parent)
 {
     m_combo = parent;
 }
 
                   : wxPopupTransientWindow(parent)
 {
     m_combo = parent;
 }
 

-bool wxPopupComboWindow::Create(wxComboControl *parent)
+bool wxPopupComboWindow::Create(wxComboCtrl *parent)

 {
     m_combo = parent;
 
 {
     m_combo = parent;
 


@@ -382,7 +432,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent)
 void wxPopupComboWindow::PositionNearCombo()
 {
     // the origin point must be in screen coords
 void wxPopupComboWindow::PositionNearCombo()
 {
     // the origin point must be in screen coords

-    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0));
+    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));

 
 #if 0 //def __WXUNIVERSAL__
     // account for the fact that (0, 0) is not the top left corner of the
 
 #if 0 //def __WXUNIVERSAL__
     // account for the fact that (0, 0) is not the top left corner of the


@@ -400,7 +450,7 @@ void wxPopupComboWindow::PositionNearCombo()
 
 void wxPopupComboWindow::OnDismiss()
 {
 
 void wxPopupComboWindow::OnDismiss()
 {

-    m_combo->OnDismiss();
+    m_combo->OnPopupDismiss();

 }
 
 void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
 }
 
 void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)


@@ -425,8 +475,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
     wxPoint pos = event.GetPosition();
 
 
     wxPoint pos = event.GetPosition();
 

-    // scrollbar on which the click occured
+    // in non-Univ ports the system manages scrollbars for us
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
+    // scrollbar on which the click occurred

     wxWindow *sbar = NULL;
     wxWindow *sbar = NULL;

+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR

 
     wxWindow *win = (wxWindow *)event.GetEventObject();
 
 
     wxWindow *win = (wxWindow *)event.GetEventObject();
 


@@ -446,20 +499,20 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
                 // dismissing a tooltip shouldn't waste a click, i.e. you
                 // should be able to dismiss it and press the button with the
                 // same click, so repost this event to the window beneath us
                 // dismissing a tooltip shouldn't waste a click, i.e. you
                 // should be able to dismiss it and press the button with the
                 // same click, so repost this event to the window beneath us

-                wxWindow *win = wxFindWindowAtPoint(event2.GetPosition());
-                if ( win )
+                wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition());
+                if ( winUnder )

                 {
                     // translate the event coords to the ones of the window
                     // which is going to get the event
                 {
                     // translate the event coords to the ones of the window
                     // which is going to get the event

-                    win->ScreenToClient(&event2.m_x, &event2.m_y);
+                    winUnder->ScreenToClient(&event2.m_x, &event2.m_y);

 
 

-                    event2.SetEventObject(win);
-                    wxPostEvent(win, event2);
+                    event2.SetEventObject(winUnder);
+                    wxPostEvent(winUnder, event2);

                 }
             }
             break;
 
                 }
             }
             break;
 

-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR

         case wxHT_WINDOW_HORZ_SCROLLBAR:
             sbar = win->GetScrollbar(wxHORIZONTAL);
             break;
         case wxHT_WINDOW_HORZ_SCROLLBAR:
             sbar = win->GetScrollbar(wxHORIZONTAL);
             break;


@@ -467,7 +520,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
         case wxHT_WINDOW_VERT_SCROLLBAR:
             sbar = win->GetScrollbar(wxVERTICAL);
             break;
         case wxHT_WINDOW_VERT_SCROLLBAR:
             sbar = win->GetScrollbar(wxVERTICAL);
             break;

-#endif
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR

 
         default:
             // forgot to update the switch after adding a new hit test code?
 
         default:
             // forgot to update the switch after adding a new hit test code?


@@ -484,6 +537,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
             break;
     }
 
             break;
     }
 

+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR

     if ( sbar )
     {
         // translate the event coordinates to the scrollbar ones
     if ( sbar )
     {
         // translate the event coordinates to the scrollbar ones


@@ -496,6 +550,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
         (void)sbar->GetEventHandler()->ProcessEvent(event2);
     }
 
         (void)sbar->GetEventHandler()->ProcessEvent(event2);
     }

+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -519,8 +574,18 @@ 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
     // 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();
     {
         // by default, dismiss the popup
         m_popup->DismissAndNotify();


@@ -528,4 +593,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 }
 
 #endif // wxUSE_POPUPWIN
 }
 
 #endif // wxUSE_POPUPWIN

-