Updates for Y positioning

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 36382fca0ab7d8d8f8dd5eb2f7e344e0203d85e7..dd72510c5fc420d9bc7938b72f6ec1b0028e20e7 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -40,6 +40,18 @@
     #include "wx/univ/renderer.h"
 #endif // __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
+// probably could do it for all ports here just as well
+#if defined(__WXMSW__) || defined(__WXMGL__)
+    IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
+#endif // __WXMSW__
+
+IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
+
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
+    IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow)
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -64,15 +76,30 @@ private:
 class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
 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);
 
 protected:
     // event handlers
     void OnKillFocus(wxFocusEvent& event);

+    void OnKeyDown(wxKeyEvent& event);

 
 private:
     wxPopupTransientWindow *m_popup;
 
 
 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()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -86,6 +113,7 @@ END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
     EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
 
 BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
     EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)

+    EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -96,6 +124,11 @@ END_EVENT_TABLE()
 // wxPopupWindowBase
 // ----------------------------------------------------------------------------
 
 // wxPopupWindowBase
 // ----------------------------------------------------------------------------
 

+wxPopupWindowBase::~wxPopupWindowBase()
+{
+    // this destructor is required for Darwin
+}
+

 bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
 {
     return TRUE;
 bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
 {
     return TRUE;


@@ -145,32 +178,49 @@ void wxPopupTransientWindow::Init()
 {
     m_child =
     m_focus = (wxWindow *)NULL;
 {
     m_child =
     m_focus = (wxWindow *)NULL;

+
+    m_handlerFocus = NULL;
+    m_handlerPopup = NULL;

 }
 
 }
 

-wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent)
+wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)

 {
     Init();
 
 {
     Init();
 

-    (void)Create(parent);
+    (void)Create(parent, style);

 }
 
 wxPopupTransientWindow::~wxPopupTransientWindow()
 {
     PopHandlers();
 }
 
 wxPopupTransientWindow::~wxPopupTransientWindow()
 {
     PopHandlers();

+
+    delete m_handlerFocus;
+    delete m_handlerPopup;

 }
 
 void wxPopupTransientWindow::PopHandlers()
 {
     if ( m_child )
     {
 }
 
 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_child->ReleaseMouse();
         m_child = NULL;
     }
 
     if ( m_focus )
     {

-        m_focus->PopEventHandler(TRUE /* delete it */);
+        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
+        {
+            // see above
+            m_handlerFocus = NULL;
+        }
+

         m_focus = NULL;
     }
 }
         m_focus = NULL;
     }
 }


@@ -187,21 +237,32 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
         m_child = this;
     }
 
         m_child = this;
     }
 

-    // we can't capture mouse before the window is shown in wxGTL
-#ifdef __WXGTK__
+    // we can't capture mouse before the window is shown in wxGTK, so do it
+    // first

     Show();
     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 = winFocus ? winFocus : this;

-    m_focus->PushEventHandler(new wxPopupFocusHandler(this));

     m_focus->SetFocus();
     m_focus->SetFocus();

+
+#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__
+    {
+        delete m_handlerFocus;
+        m_handlerFocus = new wxPopupFocusHandler(this);
+
+        m_focus->PushEventHandler(m_handlerFocus);
+    }

 }
 
 void wxPopupTransientWindow::Dismiss()
 }
 
 void wxPopupTransientWindow::Dismiss()


@@ -229,7 +290,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
     return FALSE;
 }
 
     return FALSE;
 }
 

-#if wxUSE_COMBOBOX
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow
 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow


@@ -253,7 +314,7 @@ void wxPopupComboWindow::PositionNearCombo()
     // the origin point must be in screen coords
     wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0));
 
     // the origin point must be in screen coords
     wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0));
 

-#ifdef __WXUNIVERSAL__
+#if 0 //def __WXUNIVERSAL__

     // account for the fact that (0, 0) is not the top left corner of the
     // window: there is also the border
     wxRect rectBorders = m_combo->GetRenderer()->
     // account for the fact that (0, 0) is not the top left corner of the
     // window: there is also the border
     wxRect rectBorders = m_combo->GetRenderer()->


@@ -272,7 +333,7 @@ void wxPopupComboWindow::OnDismiss()
     m_combo->OnDismiss();
 }
 
     m_combo->OnDismiss();
 }
 

-#endif // wxUSE_COMBOBOX
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)

 
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler
 
 // ----------------------------------------------------------------------------
 // wxPopupWindowHandler


@@ -300,6 +361,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
             m_popup->DismissAndNotify();
             break;
 
             m_popup->DismissAndNotify();
             break;
 

+#ifdef __WXUNIVERSAL__

         case wxHT_WINDOW_HORZ_SCROLLBAR:
             sbar = win->GetScrollbar(wxHORIZONTAL);
             break;
         case wxHT_WINDOW_HORZ_SCROLLBAR:
             sbar = win->GetScrollbar(wxHORIZONTAL);
             break;


@@ -307,6 +369,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
         case wxHT_WINDOW_VERT_SCROLLBAR:
             sbar = win->GetScrollbar(wxVERTICAL);
             break;
         case wxHT_WINDOW_VERT_SCROLLBAR:
             sbar = win->GetScrollbar(wxVERTICAL);
             break;

+#endif

 
         default:
             // forgot to update the switch after adding a new hit test code?
 
         default:
             // forgot to update the switch after adding a new hit test code?


@@ -343,12 +406,31 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {

-    // when we lose focus we always disappear
+#ifdef __WXGTK__
+    // ignore the next OnKillFocus() call
+    if ( time(NULL) < m_creationTime + 1 )
+    {
+        event.Skip();
+
+        return;
+    }
+#endif // __WXGTK__

 
 

-    // But if m_popup was about to get the focus,
-    // don't disappear.
-    if (event.GetWindow() != m_popup)
+    // 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();
 }
 
         m_popup->DismissAndNotify();
 }
 

+void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
+{
+    // let the window have it first, it might process the keys
+    if ( !m_popup->ProcessEvent(event) )
+    {
+        // by default, dismiss the popup
+        m_popup->DismissAndNotify();
+    }
+}
+

 #endif // wxUSE_POPUPWIN
 #endif // wxUSE_POPUPWIN

+