#ifndef WX_PRECOMP
#include "wx/combobox.h" // wxComboControl
+ #include "wx/app.h" // wxPostEvent
+ #include "wx/log.h"
+ #include "wx/app.h"
#endif //WX_PRECOMP
#ifdef __WXUNIVERSAL__
#include "wx/univ/renderer.h"
#endif // __WXUNIVERSAL__
-// there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we
+// there is no src/mgl/popupwin.cpp to put this in, so we do it here - BTW we
// probably could do it for all ports here just as well
-#if defined(__WXMSW__) || defined(__WXMGL__)
+#if defined(__WXMGL__) || defined(__WXPM__)
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
#endif // __WXMSW__
class wxPopupFocusHandler : public wxEvtHandler
{
public:
- wxPopupFocusHandler(wxPopupTransientWindow *popup) { m_popup = popup; }
+ wxPopupFocusHandler(wxPopupTransientWindow *popup)
+ {
+ m_popup = popup;
+
+#ifdef __WXGTK__
+ // ignore the next few OnKillFocus() calls
+ m_creationTime = time(NULL);
+#endif // __WXGTK__
+ }
protected:
// event handlers
void OnKillFocus(wxFocusEvent& event);
- void OnKeyUp(wxKeyEvent& event);
+ void OnKeyDown(wxKeyEvent& event);
private:
wxPopupTransientWindow *m_popup;
+ // hack around wxGTK bug: we always get several kill focus events
+ // immediately after creation!
+#ifdef __WXGTK__
+ time_t m_creationTime;
+#endif // __WXGTK__
+
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
- EVT_KEY_UP(wxPopupFocusHandler::OnKeyUp)
+ EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
END_EVENT_TABLE()
// ============================================================================
{
m_child =
m_focus = (wxWindow *)NULL;
+
+ m_handlerFocus = NULL;
+ m_handlerPopup = NULL;
}
wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)
wxPopupTransientWindow::~wxPopupTransientWindow()
{
PopHandlers();
+
+ delete m_handlerFocus;
+ delete m_handlerPopup;
}
void wxPopupTransientWindow::PopHandlers()
{
if ( m_child )
{
- m_child->PopEventHandler(TRUE /* delete it */);
+ 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;
+ }
+
m_child->ReleaseMouse();
m_child = NULL;
}
if ( m_focus )
{
- m_focus->PopEventHandler(TRUE /* delete it */);
+#ifndef __WXX11__
+ if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
+ {
+ // see above
+ m_handlerFocus = NULL;
+ }
+#endif
m_focus = NULL;
}
}
m_child = this;
}
- // we can't capture mouse before the window is shown in wxGTK
-#ifdef __WXGTK__
+ // we can't capture mouse before the window is shown in wxGTK, so do it
+ // first
Show();
-#endif
- m_child->CaptureMouse();
- m_child->PushEventHandler(new wxPopupWindowHandler(this));
+ delete m_handlerPopup;
+ m_handlerPopup = new wxPopupWindowHandler(this);
-#ifndef __WXGTK__
- Show();
-#endif
+ m_child->CaptureMouse();
+ m_child->PushEventHandler(m_handlerPopup);
m_focus = winFocus ? winFocus : this;
m_focus->SetFocus();
- // FIXME: I don't know why does this happen but sometimes SetFocus() simply
- // refuses to work under MSW - no error happens but the focus is not
- // given to the window, i.e. the assert below is triggered
- //
- // Try work around this as we can...
-#if 0
- wxASSERT_MSG( FindFocus() == m_focus, _T("setting focus failed") );
-#else
- m_focus = FindFocus();
-#endif
+#ifndef __WXX11__
+#ifdef __WXMSW__
+ // MSW doesn't allow to set focus to the popup window, but we need to
+ // subclass the window which has the focus, and not winFocus passed in or
+ // otherwise everything else breaks down
+ m_focus = FindFocus();
if ( m_focus )
+#endif // __WXMSW__
{
- m_focus->PushEventHandler(new wxPopupFocusHandler(this));
+ delete m_handlerFocus;
+ m_handlerFocus = new wxPopupFocusHandler(this);
+
+ m_focus->PushEventHandler(m_handlerFocus);
}
+
+#endif // !__WXX11__
}
void wxPopupTransientWindow::Dismiss()
// wxPopupComboWindow
// ----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
+ EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
+END_EVENT_TABLE()
+
wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
: wxPopupTransientWindow(parent)
{
m_combo->OnDismiss();
}
+void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
+{
+ m_combo->ProcessEvent(event);
+}
+
#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
// ----------------------------------------------------------------------------
wxWindow *sbar = NULL;
wxWindow *win = (wxWindow *)event.GetEventObject();
+
switch ( win->HitTest(pos.x, pos.y) )
{
case wxHT_WINDOW_OUTSIDE:
- // clicking outside a popup dismisses it
- m_popup->DismissAndNotify();
+ {
+ // do the coords translation now as after DismissAndNotify()
+ // m_popup may be destroyed
+ wxMouseEvent event2(event);
+
+ m_popup->ClientToScreen(&event2.m_x, &event2.m_y);
+
+ // clicking outside a popup dismisses it
+ m_popup->DismissAndNotify();
+
+ // 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 )
+ {
+ // 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);
+
+ event2.SetEventObject(win);
+ wxPostEvent(win, event2);
+ }
+ }
break;
#ifdef __WXUNIVERSAL__
void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
{
+#ifdef __WXGTK__
+ // ignore the next OnKillFocus() call
+ if ( time(NULL) < m_creationTime + 1 )
+ {
+ event.Skip();
+
+ return;
+ }
+#endif // __WXGTK__
+
// when we lose focus we always disappear - unless it goes to the popup (in
// which case we don't really lose it)
- if ( event.GetWindow() != m_popup )
- m_popup->DismissAndNotify();
+ wxWindow *win = event.GetWindow();
+ while ( win )
+ {
+ if ( win == m_popup )
+ return;
+ win = win->GetParent();
+ }
+
+ m_popup->DismissAndNotify();
}
-void wxPopupFocusHandler::OnKeyUp(wxKeyEvent& event)
+void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
{
// let the window have it first, it might process the keys
if ( !m_popup->ProcessEvent(event) )
projects / wxWidgets.git / blobdiff