PCH build fix.

[wxWidgets.git] / src / gtk / popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 604d0565c8eef72a6bfe1af7db509e6e72b3b039..98bb95953fd2dccc2d12a91fb6602711a75a111f 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.cpp
+// Name:        src/gtk/popupwin.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -13,23 +13,20 @@
 #if wxUSE_POPUPWIN
 
 #include "wx/popupwin.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "wx/gtk/private.h" //for idle stuff
 #include "wx/gtk/win_gtk.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // "button_press"
 //-----------------------------------------------------------------------------
@@ -39,13 +36,16 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
 {
     GtkWidget *child = gtk_get_event_widget (gdk_event);
 
-  /* We don't ask for button press events on the grab widget, so
-   *  if an event is reported directly to the grab widget, it must
-   *  be on a window outside the application (and thus we remove
-   *  the popup window). Otherwise, we check if the widget is a child
-   *  of the grab widget, and only remove the popup window if it
-   *  is not.
-   */
+    /* Ignore events sent out before we connected to the signal */
+    if (win->m_time >= ((GdkEventButton*)gdk_event)->time)
+        return FALSE;
+
+    /*  We don't ask for button press events on the grab widget, so
+     *  if an event is reported directly to the grab widget, it must
+     *  be on a window outside the application (and thus we remove
+     *  the popup window). Otherwise, we check if the widget is a child
+     *  of the grab widget, and only remove the popup window if it
+     *  is not. */
     if (child != widget)
     {
         while (child)
@@ -75,7 +75,7 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    // This disables GTK's tab traversal
+    /* This disables GTK's tab traversal */
     g_signal_stop_emission_by_name (widget, "focus");
     return TRUE;
 }
@@ -168,13 +168,13 @@ wxPopupWindow::~wxPopupWindow()
 
 bool wxPopupWindow::Create( wxWindow *parent, int style )
 {
-    m_needParent = FALSE;
+    m_needParent = false;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("popup") ))
     {
         wxFAIL_MSG( wxT("wxPopupWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     // Unlike windows, top level windows are created hidden by default.
@@ -214,10 +214,12 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     g_signal_connect (m_widget, "focus",
                       G_CALLBACK (gtk_dialog_focus_callback), this);
 
+    m_time = gtk_get_current_event_time();
+
     g_signal_connect (m_widget, "button_press_event",
                       G_CALLBACK (gtk_popup_button_press), this);
 
-    return TRUE;
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
@@ -231,7 +233,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
+    m_resizing = true;
 
     int old_x = m_x;
     int old_y = m_y;
@@ -282,7 +284,8 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
         {
             /* we set the position here and when showing the dialog
                for the first time in idle time */
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+            // Where does that happen in idle time? I do not see it anywhere - MR
+            gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
         }
     }
 
@@ -292,11 +295,11 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag
 
         /* actual resizing is deferred to GtkOnSize in idle time and
            when showing the dialog */
-        m_sizeSet = FALSE;
+        m_sizeSet = false;
 
     }
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -330,7 +333,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int
                                    (GdkWindowHints) flag );
 
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );