Add wxUSE_TARSTREAM and wxUSE_FS_ARCHIVE.

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index de7f0683b69446fcef08a512ed675d2cd6071879..d0a3534f37500fd1ee8ec719c5ede2de0bed9616 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -373,7 +373,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() )
             {


@@ -561,7 +561,7 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 {
     // let the window have it first, it might process the keys
 void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
 {
     // 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();