blind fix for XTI compilation after last change

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

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 92a8ccb5b6c0b48c325100ab76a8ace32e531499..0c94b3838d6197bfdda31076aa0599e2119fe7d0 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "popupwinbase.h"
 #endif
 
     #pragma implementation "popupwinbase.h"
 #endif
 


@@ -28,25 +28,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_POPUPWIN && !defined(__WXMOTIF__)
+#if wxUSE_POPUPWIN

 
 #include "wx/popupwin.h"
 
 #ifndef WX_PRECOMP
     #include "wx/combobox.h"        // wxComboControl
 
 #include "wx/popupwin.h"
 
 #ifndef WX_PRECOMP
     #include "wx/combobox.h"        // wxComboControl

+    #include "wx/app.h"             // wxPostEvent

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif //WX_PRECOMP
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/renderer.h"
 #endif // __WXUNIVERSAL__
 
 #endif //WX_PRECOMP
 
 #ifdef __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__
+#ifdef __WXGTK__
+    #include <gtk/gtk.h>
+#endif

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)

 IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -72,6 +73,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)

 };
 
 class wxPopupFocusHandler : public wxEvtHandler
 };
 
 class wxPopupFocusHandler : public wxEvtHandler


@@ -80,28 +82,17 @@ 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:
     }
 
 protected:

-    // event handlers

     void OnKillFocus(wxFocusEvent& event);
     void OnKeyDown(wxKeyEvent& event);
 
 private:
     wxPopupTransientWindow *m_popup;
 
     void OnKillFocus(wxFocusEvent& event);
     void OnKeyDown(wxKeyEvent& event);
 
 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()

+    DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -132,7 +123,7 @@ wxPopupWindowBase::~wxPopupWindowBase()
 
 bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
 {
 
 bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
 {

-    return TRUE;
+    return true;

 }
 
 void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
 }
 
 void wxPopupWindowBase::Position(const wxPoint& ptOrigin,


@@ -194,16 +185,13 @@ wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int 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 )
     {

-        if ( !m_child->RemoveEventHandler(m_handlerPopup) )
+        if ( m_handlerPopup && !m_child->RemoveEventHandler(m_handlerPopup) )

         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time
         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time


@@ -214,17 +202,30 @@ void wxPopupTransientWindow::PopHandlers()
         m_child = NULL;
     }
 
         m_child = NULL;
     }
 

+#ifdef __WXMSW__

     if ( m_focus )
     {
     if ( m_focus )
     {

-#ifndef __WXX11__
-        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
+        if ( m_handlerFocus && !m_focus->RemoveEventHandler(m_handlerFocus) )

         {
             // see above
             m_handlerFocus = NULL;
         }
         {
             // see above
             m_handlerFocus = NULL;
         }

-#endif
-        m_focus = 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;

 }
 
 void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 }
 
 void wxPopupTransientWindow::Popup(wxWindow *winFocus)


@@ -239,36 +240,54 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
         m_child = this;
     }
 
         m_child = this;
     }
 

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

     Show();
 
     delete m_handlerPopup;
     m_handlerPopup = new wxPopupWindowHandler(this);
 
     Show();
 
     delete m_handlerPopup;
     m_handlerPopup = new wxPopupWindowHandler(this);
 

-    m_child->CaptureMouse();
+    // m_child->CaptureMouse();

     m_child->PushEventHandler(m_handlerPopup);
 
     m_focus = winFocus ? winFocus : this;
     m_focus->SetFocus();
 
     m_child->PushEventHandler(m_handlerPopup);
 
     m_focus = winFocus ? winFocus : this;
     m_focus->SetFocus();
 

-#ifndef __WXX11__
-

 #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 )
 #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);
     }
     {
         delete 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)
+        gtk_grab_remove( m_widget );
+#endif
+
+    bool ret = wxPopupWindow::Show( show );
+    
+#ifdef __WXGTK__
+    if (show)
+        gtk_grab_add( m_widget );
+#endif

 
 

-#endif // !__WXX11__
+    return ret;

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


@@ -293,7 +312,7 @@ void wxPopupTransientWindow::OnDismiss()
 bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
 {
     // no special processing here
 bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
 {
     // no special processing here

-    return FALSE;
+    return false;

 }
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 }
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -302,6 +321,10 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
 // wxPopupComboWindow
 // ----------------------------------------------------------------------------
 
 // wxPopupComboWindow
 // ----------------------------------------------------------------------------
 

+BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
+    EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
+END_EVENT_TABLE()
+

 wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
                   : wxPopupTransientWindow(parent)
 {
 wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
                   : wxPopupTransientWindow(parent)
 {


@@ -339,6 +362,11 @@ void wxPopupComboWindow::OnDismiss()
     m_combo->OnDismiss();
 }
 
     m_combo->OnDismiss();
 }
 

+void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
+{
+    m_combo->ProcessEvent(event);
+}
+

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


@@ -435,16 +463,6 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {

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

     // when we lose focus we always disappear - unless it goes to the popup (in
     // which case we don't really lose it)
     wxWindow *win = event.GetWindow();
     // when we lose focus we always disappear - unless it goes to the popup (in
     // which case we don't really lose it)
     wxWindow *win = event.GetWindow();