///////////////////////////////////////////////////////////////////////////////
-// Name: common/popupcmn.cpp
+// Name: src/common/popupcmn.cpp
// Purpose: implementation of wxPopupTransientWindow
// Author: Vadim Zeitlin
// Modified by:
// 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"
#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__
{
public:
wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
- ~wxPopupWindowHandler();
protected:
// event handlers
{
public:
wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
- ~wxPopupFocusHandler();
protected:
void OnKillFocus(wxFocusEvent& event);
{
if (m_handlerPopup && m_handlerPopup->GetNextHandler())
PopHandlers();
-
+
wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
m_handlerPopup = NULL;
}
if (m_child->HasCapture())
- {
+ {
m_child->ReleaseMouse();
}
m_child = NULL;
// subclass the window which has the focus, and not winFocus passed in or
// otherwise everything else breaks down
m_focus = FindFocus();
-#elif __WXGTK__
+#elif defined(__WXGTK__)
// GTK+ catches the activate events from the popup
// window, not the focus events from the child window
m_focus = this;
m_focus->PushEventHandler(m_handlerFocus);
}
-
- // 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 )
#ifdef __WXMSW__
if (!show && m_child && m_child->HasCapture())
- {
+ {
m_child->ReleaseMouse();
}
#endif
-
+
bool ret = wxPopupWindow::Show( show );
#ifdef __WXGTK__
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)
{
wxPoint pos = ScreenToClient(wxGetMousePosition());
wxRect rect(GetSize());
- if ( rect.Inside(pos) )
+ if ( rect.Contains(pos) )
{
if ( m_child->HasCapture() )
{
{
m_child->CaptureMouse();
}
- }
+ }
}
}
-#endif
+#endif // __WXMSW__
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
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;
void wxPopupComboWindow::OnDismiss()
{
- m_combo->OnDismiss();
+ m_combo->OnPopupDismiss();
}
void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
// ----------------------------------------------------------------------------
// wxPopupWindowHandler
// ----------------------------------------------------------------------------
-wxPopupWindowHandler::~wxPopupWindowHandler()
-{
- if (m_popup && (m_popup->m_handlerPopup == this))
- m_popup->m_handlerPopup = NULL;
-}
void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
{
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;
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
wxWindow *win = (wxWindow *)event.GetEventObject();
// 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;
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?
break;
}
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
if ( sbar )
{
// translate the event coordinates to the scrollbar ones
(void)sbar->GetEventHandler()->ProcessEvent(event2);
}
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
}
// ----------------------------------------------------------------------------
// wxPopupFocusHandler
// ----------------------------------------------------------------------------
-wxPopupFocusHandler::~wxPopupFocusHandler()
-{
- if (m_popup && (m_popup->m_handlerFocus == this))
- m_popup->m_handlerFocus = NULL;
-}
void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
{
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();
}
#endif // wxUSE_POPUPWIN
-