// Created: 06.01.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/log.h"
#endif //WX_PRECOMP
+#include "wx/display.h"
#include "wx/recguard.h"
#ifdef __WXUNIVERSAL__
#ifdef __WXGTK__
#include <gtk/gtk.h>
+ #if GTK_CHECK_VERSION(2,0,0)
+ #include "wx/gtk/private/gtk2-compat.h"
+ #else
+ #define gtk_widget_get_window(x) x->window
+ #endif
#elif defined(__WXMSW__)
#include "wx/msw/private.h"
#elif defined(__WXX11__)
protected:
// event handlers
void OnLeftDown(wxMouseEvent& event);
+ void OnCaptureLost(wxMouseCaptureLostEvent& event);
private:
wxPopupTransientWindow *m_popup;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)
+ wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);
};
class wxPopupFocusHandler : public wxEvtHandler
protected:
void OnKillFocus(wxFocusEvent& event);
- void OnKeyDown(wxKeyEvent& event);
+ void OnChar(wxKeyEvent& event);
private:
wxPopupTransientWindow *m_popup;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)
+ wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);
};
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler)
EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown)
+ EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
- EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
+ EVT_CHAR(wxPopupFocusHandler::OnChar)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
EVT_IDLE(wxPopupTransientWindow::OnIdle)
#endif
END_EVENT_TABLE()
void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
const wxSize& size)
{
- wxSize sizeScreen = wxGetDisplaySize(),
- sizeSelf = GetSize();
+ // determine the position and size of the screen we clamp the popup to
+ wxPoint posScreen;
+ wxSize sizeScreen;
+
+ const int displayNum = wxDisplay::GetFromPoint(ptOrigin);
+ if ( displayNum != wxNOT_FOUND )
+ {
+ const wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
+ posScreen = rectScreen.GetPosition();
+ sizeScreen = rectScreen.GetSize();
+ }
+ else // outside of any display?
+ {
+ // just use the primary one then
+ posScreen = wxPoint(0, 0);
+ sizeScreen = wxGetDisplaySize();
+ }
+
+
+ const wxSize sizeSelf = GetSize();
// is there enough space to put the popup below the window (where we put it
// by default)?
wxCoord y = ptOrigin.y + size.y;
- if ( y + sizeSelf.y > sizeScreen.y )
+ if ( y + sizeSelf.y > posScreen.y + sizeScreen.y )
{
// check if there is enough space above
if ( ptOrigin.y > sizeSelf.y )
// now check left/right too
wxCoord x = ptOrigin.x;
-
+
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
{
// shift the window to the left instead of the right.
else
x += size.x;
-
- if ( x + sizeSelf.x > sizeScreen.x )
+
+ if ( x + sizeSelf.x > posScreen.x + sizeScreen.x )
{
// check if there is enough space to the left
if ( ptOrigin.x > sizeSelf.x )
Show();
- // There is is a problem if these are still in use
+ // There is a problem if these are still in use
wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
m_focus->SetFocus();
}
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
+#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON)
// 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
{
gtk_grab_add( m_widget );
- gdk_pointer_grab( m_widget->window, TRUE,
+ gdk_pointer_grab( gtk_widget_get_window(m_widget), true,
(GdkEventMask)
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
return ret;
}
+bool wxPopupTransientWindow::Destroy()
+{
+ // The popup window can be deleted at any moment, even while some events
+ // are still being processed for it, so delay its real destruction until
+ // the next idle time when we're sure that it's safe to really destroy it.
+
+ wxCHECK_MSG( !wxPendingDelete.Member(this), false,
+ wxS("Shouldn't destroy the popup twice.") );
+
+ wxPendingDelete.Append(this);
+
+ return true;
+}
+
void wxPopupTransientWindow::Dismiss()
{
Hide();
return false;
}
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
{
event.Skip();
}
}
}
-#endif // __WXMSW__
+#endif // wxOSX/Carbon
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
void wxPopupComboWindow::OnDismiss()
{
- m_combo->OnPopupDismiss();
+ m_combo->OnPopupDismiss(true);
}
void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
{
- m_combo->ProcessEvent(event);
+ m_combo->ProcessWindowEvent(event);
}
#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
default:
// forgot to update the switch after adding a new hit test code?
- wxFAIL_MSG( _T("unexpected HitTest() return value") );
+ wxFAIL_MSG( wxT("unexpected HitTest() return value") );
// fall through
case wxHT_WINDOW_CORNER:
#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
}
+void
+wxPopupWindowHandler::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+ m_popup->DismissAndNotify();
+
+ // There is no need to skip the event here, normally we've already dealt
+ // with the focus loss.
+}
+
// ----------------------------------------------------------------------------
// wxPopupFocusHandler
// ----------------------------------------------------------------------------
m_popup->DismissAndNotify();
}
-void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
+void wxPopupFocusHandler::OnChar(wxKeyEvent& event)
{
// we can be associated with the popup itself in which case we should avoid
// infinite recursion
projects / wxWidgets.git / blobdiff