// 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"
#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)
class wxPopupWindowHandler : public wxEvtHandler
{
public:
- wxPopupWindowHandler(wxPopupTransientWindow *popup) { m_popup = popup; }
+ wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
protected:
// event handlers
class wxPopupFocusHandler : public wxEvtHandler
{
public:
- wxPopupFocusHandler(wxPopupTransientWindow *popup)
- {
- m_popup = popup;
- }
+ wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
protected:
void OnKillFocus(wxFocusEvent& event);
EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
+#ifdef __WXMSW__
+ EVT_IDLE(wxPopupTransientWindow::OnIdle)
+#endif
+END_EVENT_TABLE()
+
// ============================================================================
// implementation
// ============================================================================
wxPopupTransientWindow::~wxPopupTransientWindow()
{
- PopHandlers();
+ if (m_handlerPopup && m_handlerPopup->GetNextHandler())
+ PopHandlers();
+
+ wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+ wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+ delete m_handlerFocus;
+ delete m_handlerPopup;
}
void wxPopupTransientWindow::PopHandlers()
{
if ( m_child )
{
- if ( m_handlerPopup && !m_child->RemoveEventHandler(m_handlerPopup) )
+ 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;
}
-
if (m_child->HasCapture())
+ {
m_child->ReleaseMouse();
+ }
m_child = NULL;
}
-#ifdef __WXMSW__
if ( m_focus )
{
- if ( m_handlerFocus && !m_focus->RemoveEventHandler(m_handlerFocus) )
+ if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
{
// see above
m_handlerFocus = NULL;
}
}
-#else
- if ( m_handlerFocus && !RemoveEventHandler(m_handlerFocus) )
- {
- // see above
- m_handlerFocus = NULL;
- }
-#endif
-
- // delete the handlers, they'll be created as necessary in Popup()
- delete m_handlerPopup;
- m_handlerPopup = NULL;
- delete m_handlerFocus;
- m_handlerFocus = NULL;
-
m_focus = NULL;
}
Show();
- delete m_handlerPopup;
- m_handlerPopup = new wxPopupWindowHandler(this);
+ // There is is a problem if these are still in use
+ wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+ wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+ if (!m_handlerPopup)
+ m_handlerPopup = new wxPopupWindowHandler(this);
- // m_child->CaptureMouse();
m_child->PushEventHandler(m_handlerPopup);
m_focus = winFocus ? winFocus : this;
// subclass the window which has the focus, and not winFocus passed in or
// otherwise everything else breaks down
m_focus = FindFocus();
+#elif defined(__WXGTK__)
+ // GTK+ catches the activate events from the popup
+ // window, not the focus events from the child window
+ m_focus = this;
+#endif
+
if ( m_focus )
{
- delete m_handlerFocus;
- m_handlerFocus = new wxPopupFocusHandler(this);
+ if (!m_handlerFocus)
+ m_handlerFocus = new wxPopupFocusHandler(this);
m_focus->PushEventHandler(m_handlerFocus);
}
-#else
- // GTK+ catches the activate events from the popup
- // window, not the focus events from the child window
- delete m_handlerFocus;
- m_handlerFocus = new wxPopupFocusHandler(this);
- PushEventHandler(m_handlerFocus);
-#endif // __WXMSW__
-
}
bool wxPopupTransientWindow::Show( bool show )
{
#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
+
+#ifdef __WXMSW__
+ if (!show && m_child && m_child->HasCapture())
+ {
+ m_child->ReleaseMouse();
+ }
#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
+
+#ifdef __WXMSW__
+ if (show && m_child)
+ {
+ // Assume that the mouse is outside the popup to begin with
+ m_child->CaptureMouse();
+ }
#endif
return ret;
void wxPopupTransientWindow::Dismiss()
{
- PopHandlers();
-
Hide();
+ PopHandlers();
}
void wxPopupTransientWindow::DismissAndNotify()
{
Dismiss();
-
OnDismiss();
}
return false;
}
+#ifdef __WXMSW__
+void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
+{
+ event.Skip();
+
+ if (IsShown() && m_child)
+ {
+ wxPoint pos = ScreenToClient(wxGetMousePosition());
+ wxRect rect(GetSize());
+
+ if ( rect.Inside(pos) )
+ {
+ if ( m_child->HasCapture() )
+ {
+ m_child->ReleaseMouse();
+ }
+ }
+ else
+ {
+ if ( !m_child->HasCapture() )
+ {
+ m_child->CaptureMouse();
+ }
+ }
+ }
+}
+#endif // __WXMSW__
+
+
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
// ----------------------------------------------------------------------------
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
wxPoint pos = event.GetPosition();
- // scrollbar on which the click occured
+ // scrollbar on which the click occurred
wxWindow *sbar = NULL;
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;
projects / wxWidgets.git / blobdiff