Correct signature of HitTest()

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 150f81a92cba619d089a8bec466e1d75e8aaa8ab..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__


@@ -67,7 +65,6 @@ class wxPopupWindowHandler : public wxEvtHandler
 {
 public:
     wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
 {
 public:
     wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

-    ~wxPopupWindowHandler();

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


@@ -84,7 +81,6 @@ class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
     wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
 {
 public:
     wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}

-    ~wxPopupFocusHandler();

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


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


@@ -192,49 +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;
         }
         if (m_child->HasCapture())
         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time
             m_handlerPopup = NULL;
         }
         if (m_child->HasCapture())

-        {       
+        {

             m_child->ReleaseMouse();
         }
         m_child = NULL;
     }
 
             m_child->ReleaseMouse();
         }
         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;
 }
 


@@ -252,12 +251,12 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     Show();
 
 
     Show();
 

-    // There is is a problem if these are still valid
-    wxASSERT_MSG(!m_handlerPopup, wxT("Popup handler not deleted"));
-    wxASSERT_MSG(!m_handlerFocus, wxT("Focus handler not deleted"));
+    // There is is a problem if these are still in use
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());

 
 

-    delete m_handlerPopup;
-    m_handlerPopup = new wxPopupWindowHandler(this);
+    if (!m_handlerPopup)
+        m_handlerPopup = new wxPopupWindowHandler(this);

 
     m_child->PushEventHandler(m_handlerPopup);
 
 
     m_child->PushEventHandler(m_handlerPopup);
 


@@ -269,30 +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__
-
-    // catch destroy events, if you close a program with a popup shown in MSW
-    // you get a segfault if m_child or m_focus are deleted before this is
-    m_child->Connect(wxEVT_DESTROY,
-                     wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                     NULL, this);
-    if (m_focus)
-        m_focus->Connect(wxEVT_DESTROY,
-                         wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                         NULL, this);

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


@@ -315,11 +303,11 @@ bool wxPopupTransientWindow::Show( bool show )
 
 #ifdef __WXMSW__
     if (!show && m_child && m_child->HasCapture())
 
 #ifdef __WXMSW__
     if (!show && m_child && m_child->HasCapture())

-    {       
+    {

         m_child->ReleaseMouse();
     }
 #endif
         m_child->ReleaseMouse();
     }
 #endif

-    
+

     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__
     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__


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

-void wxPopupTransientWindow::OnDestroy(wxWindowDestroyEvent& event)
-{
-    if (event.GetEventObject() == m_child)
-        m_child = NULL;
-    if (event.GetEventObject() == m_focus)
-        m_focus = NULL;
-}
-

 #ifdef __WXMSW__
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
 #ifdef __WXMSW__
 void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {


@@ -407,7 +387,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
         wxPoint pos = ScreenToClient(wxGetMousePosition());
         wxRect rect(GetSize());
 
         wxPoint pos = ScreenToClient(wxGetMousePosition());
         wxRect rect(GetSize());
 

-        if ( rect.Inside(pos) )
+        if ( rect.Contains(pos) )

         {
             if ( m_child->HasCapture() )
             {
         {
             if ( m_child->HasCapture() )
             {


@@ -420,10 +400,10 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
             {
                 m_child->CaptureMouse();
             }
             {
                 m_child->CaptureMouse();
             }

-        }                
+        }

     }
 }
     }
 }

-#endif
+#endif // __WXMSW__

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


@@ -436,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;
 


@@ -470,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)


@@ -483,11 +463,6 @@ void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler
 // ----------------------------------------------------------------------------

-wxPopupWindowHandler::~wxPopupWindowHandler()
-{
-    if (m_popup && (m_popup->m_handlerPopup == this))
-        m_popup->m_handlerPopup = NULL;
-}

 
 void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 {
 
 void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 {


@@ -500,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();
 


@@ -521,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;


@@ -542,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?


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


@@ -571,16 +550,12 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
         (void)sbar->GetEventHandler()->ProcessEvent(event2);
     }
 
         (void)sbar->GetEventHandler()->ProcessEvent(event2);
     }

+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR

 }
 
 // ----------------------------------------------------------------------------
 // wxPopupFocusHandler
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxPopupFocusHandler
 // ----------------------------------------------------------------------------

-wxPopupFocusHandler::~wxPopupFocusHandler()
-{
-    if (m_popup && (m_popup->m_handlerFocus == this))
-        m_popup->m_handlerFocus = NULL;
-}

 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {


@@ -599,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();


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

-