#ifdef __WXGTK__
#include <gtk/gtk.h>
#endif
+#ifdef __WXX11__
+#include "wx/x11/private.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
}
protected:
- // event handlers
-#ifdef __WXMSW__
- // Under MSW, we catch the kill focus event
void OnKillFocus(wxFocusEvent& event);
-#else
- // Under GTK+, event a transient popup window
- // is a toplevel window so we need to catch
- // deactivate events
- void OnActivate(wxActivateEvent &event);
-#endif
void OnKeyDown(wxKeyEvent& event);
private:
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
-#ifdef __WXMSW__
EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
-#else
- EVT_ACTIVATE(wxPopupFocusHandler::OnActivate)
-#endif
EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
END_EVENT_TABLE()
m_handlerPopup = NULL;
}
- m_child->ReleaseMouse();
m_child = NULL;
}
delete m_handlerPopup;
m_handlerPopup = new wxPopupWindowHandler(this);
- m_child->CaptureMouse();
m_child->PushEventHandler(m_handlerPopup);
m_focus = winFocus ? winFocus : this;
{
#ifdef __WXGTK__
if (!show)
+ {
+ gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
+
gtk_grab_remove( m_widget );
+ }
+#endif
+
+#ifdef __WXX11__
+ if (!show)
+ {
+ XUngrabPointer( wxGlobalDisplay(), CurrentTime );
+ }
#endif
bool ret = wxPopupWindow::Show( show );
-
+
#ifdef __WXGTK__
if (show)
+ {
gtk_grab_add( m_widget );
+
+ gdk_pointer_grab( m_widget->window, TRUE,
+ (GdkEventMask)
+ (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_POINTER_MOTION_MASK),
+ (GdkWindow *) NULL,
+ (GdkCursor *) NULL,
+ (guint32)GDK_CURRENT_TIME );
+ }
#endif
+#ifdef __WXX11__
+ if (show)
+ {
+ Window xwindow = (Window) m_clientWindow;
+
+ /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
+ True,
+ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+ GrabModeAsync,
+ GrabModeAsync,
+ None,
+ None,
+ CurrentTime );
+ }
+#endif
return ret;
}
void wxPopupComboWindow::PositionNearCombo()
{
// the origin point must be in screen coords
- wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0));
+ wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));
#if 0 //def __WXUNIVERSAL__
// account for the fact that (0, 0) is not the top left corner of the
// wxPopupFocusHandler
// ----------------------------------------------------------------------------
-#ifdef __WXMSW__
void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
{
// when we lose focus we always disappear - unless it goes to the popup (in
m_popup->DismissAndNotify();
}
-#else
-void wxPopupFocusHandler::OnActivate(wxActivateEvent &event)
-{
- if (event.GetActive())
- m_popup->DismissAndNotify();
-}
-#endif
void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
{