#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"
#endif //WX_PRECOMP
+#include "wx/display.h"
+#include "wx/recguard.h"
+
#ifdef __WXUNIVERSAL__
#include "wx/univ/renderer.h"
+ #include "wx/scrolbar.h"
#endif // __WXUNIVERSAL__
#ifdef __WXGTK__
#include <gtk/gtk.h>
-#endif
-#ifdef __WXX11__
-#include "wx/x11/private.h"
+#elif defined(__WXMSW__)
+ #include "wx/msw/private.h"
+#elif defined(__WXX11__)
+ #include "wx/x11/private.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
wxPopupTransientWindow *m_popup;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)
+ wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);
};
class wxPopupFocusHandler : public wxEvtHandler
wxPopupTransientWindow *m_popup;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)
+ wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);
};
// ----------------------------------------------------------------------------
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
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 + size.x;
- if ( x + sizeSelf.x > sizeScreen.x )
+ wxCoord x = ptOrigin.x;
+
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ // shift the window to the left instead of the right.
+ x -= size.x;
+ x -= sizeSelf.x; // also shift it by window width.
+ }
+ else
+ x += size.x;
+
+
+ if ( x + sizeSelf.x > posScreen.x + sizeScreen.x )
{
// check if there is enough space to the left
if ( ptOrigin.x > sizeSelf.x )
void wxPopupTransientWindow::Init()
{
m_child =
- m_focus = (wxWindow *)NULL;
+ m_focus = NULL;
m_handlerFocus = NULL;
m_handlerPopup = NULL;
m_child->PushEventHandler(m_handlerPopup);
- m_focus = winFocus ? winFocus : this;
- m_focus->SetFocus();
+#if defined(__WXMSW__)
+ // Focusing on child of popup window does not work on MSW unless WS_POPUP
+ // style is set. We do not even want to try to set the focus, as it may
+ // provoke errors on some Windows versions (Vista and later).
+ if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP )
+#endif
+ {
+ m_focus = winFocus ? winFocus : this;
+ m_focus->SetFocus();
+ }
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
// 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
}
#endif
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
if (!show && m_child && m_child->HasCapture())
{
m_child->ReleaseMouse();
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_POINTER_MOTION_MASK),
- (GdkWindow *) NULL,
- (GdkCursor *) NULL,
+ NULL,
+ NULL,
(guint32)GDK_CURRENT_TIME );
}
#endif
}
#endif
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
if (show && m_child)
{
// Assume that the mouse is outside the popup to begin with
return false;
}
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
{
event.Skip();
wxPoint pos = ScreenToClient(wxGetMousePosition());
wxRect rect(GetSize());
- if ( rect.Inside(pos) )
+ if ( rect.Contains(pos) )
{
if ( m_child->HasCapture() )
{
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)
{
- m_combo->ProcessEvent(event);
+ m_combo->ProcessWindowEvent(event);
}
#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
wxPoint pos = event.GetPosition();
// in non-Univ ports the system manages scrollbars for us
-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
// scrollbar on which the click occurred
wxWindow *sbar = NULL;
-#endif // __WXUNIVERSAL__
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
wxWindow *win = (wxWindow *)event.GetEventObject();
winUnder->ScreenToClient(&event2.m_x, &event2.m_y);
event2.SetEventObject(winUnder);
- wxPostEvent(winUnder, event2);
+ wxPostEvent(winUnder->GetEventHandler(), 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 // __WXUNIVERSAL__
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
default:
// forgot to update the switch after adding a new hit test code?
break;
}
-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
if ( sbar )
{
// translate the event coordinates to the scrollbar ones
(void)sbar->GetEventHandler()->ProcessEvent(event2);
}
-#endif // __WXUNIVERSAL__
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
}
// ----------------------------------------------------------------------------
void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
{
+ // we can be associated with the popup itself in which case we should avoid
+ // infinite recursion
+ static int s_inside;
+ wxRecursionGuard guard(s_inside);
+ if ( guard.IsInside() )
+ {
+ event.Skip();
+ return;
+ }
+
// 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();
projects / wxWidgets.git / blobdiff