Do not send a changed event if a button is clicked for down/up when the control is...

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 09ca583c04109e39c3d721b25864ea46b1ffdca2..41b8878af33de3ab7220aa31e6f460c862c86c2e 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:
@@ -29,10 +29,9 @@
 #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"
 #endif //WX_PRECOMP
 
 #ifdef __WXUNIVERSAL__
@@ -188,7 +187,7 @@ wxPopupTransientWindow::~wxPopupTransientWindow()
 {
     if (m_handlerPopup && m_handlerPopup->GetNextHandler())
         PopHandlers();
-        
+
     wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
     wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 
@@ -207,7 +206,7 @@ void wxPopupTransientWindow::PopHandlers()
             m_handlerPopup = NULL;
         }
         if (m_child->HasCapture())
-        {       
+        {
             m_child->ReleaseMouse();
         }
         m_child = NULL;
@@ -290,11 +289,11 @@ bool wxPopupTransientWindow::Show( bool show )
 
 #ifdef __WXMSW__
     if (!show && m_child && m_child->HasCapture())
-    {       
+    {
         m_child->ReleaseMouse();
     }
 #endif
-    
+
     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__
@@ -374,7 +373,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() )
             {
@@ -387,10 +386,10 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
             {
                 m_child->CaptureMouse();
             }
-        }                
+        }
     }
 }
-#endif
+#endif // __WXMSW__
 
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -403,13 +402,13 @@ BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
 END_EVENT_TABLE()
 
-wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
+wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent)
                   : wxPopupTransientWindow(parent)
 {
     m_combo = parent;
 }
 
-bool wxPopupComboWindow::Create(wxComboControl *parent)
+bool wxPopupComboWindow::Create(wxComboCtrl *parent)
 {
     m_combo = parent;
 
@@ -437,7 +436,7 @@ void wxPopupComboWindow::PositionNearCombo()
 
 void wxPopupComboWindow::OnDismiss()
 {
-    m_combo->OnDismiss();
+    m_combo->OnPopupDismiss();
 }
 
 void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
@@ -462,8 +461,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
     wxPoint pos = event.GetPosition();
 
+    // in non-Univ ports the system manages scrollbars for us
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
     // scrollbar on which the click occurred
     wxWindow *sbar = NULL;
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
 
     wxWindow *win = (wxWindow *)event.GetEventObject();
 
@@ -483,20 +485,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
-                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
-                    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;
 
-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
         case wxHT_WINDOW_HORZ_SCROLLBAR:
             sbar = win->GetScrollbar(wxHORIZONTAL);
             break;
@@ -504,7 +506,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
         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?
@@ -521,6 +523,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
             break;
     }
 
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
     if ( sbar )
     {
         // translate the event coordinates to the scrollbar ones
@@ -533,6 +536,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
         (void)sbar->GetEventHandler()->ProcessEvent(event2);
     }
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
 }
 
 // ----------------------------------------------------------------------------
@@ -565,4 +569,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 }
 
 #endif // wxUSE_POPUPWIN
-