X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88d197753d7595709727d9b6a79f1772c2f12a39..582f07c2532e6e2d7d1ccb235354548e9bada9bf:/src/gtk/popupwin.cpp diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 5a856f00fe..98bb95953f 100644 --- 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$ @@ -7,33 +7,26 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "popupwin.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #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 #include #include +#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" //----------------------------------------------------------------------------- @@ -43,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) @@ -79,8 +75,8 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU if (g_isIdle) wxapp_install_idle_handler(); - // This disables GTK's tab traversal - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" ); + /* This disables GTK's tab traversal */ + g_signal_stop_emission_by_name (widget, "focus"); return TRUE; } } @@ -124,7 +120,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win ) gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); - gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1); + gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE); return FALSE; } @@ -172,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. @@ -196,8 +192,8 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this ); + g_signal_connect (m_widget, "delete_event", + G_CALLBACK (gtk_dialog_delete_callback), this); m_wxwindow = gtk_pizza_new(); gtk_widget_show( m_wxwindow ); @@ -211,17 +207,19 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) /* we cannot set MWM hints before the widget has been realized, so we do this directly after realization */ - gtk_signal_connect( GTK_OBJECT(m_widget), "realize", - GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this ); + g_signal_connect (m_widget, "realize", + G_CALLBACK (gtk_dialog_realized_callback), this); // disable native tab traversal - gtk_signal_connect( GTK_OBJECT(m_widget), "focus", - GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this ); + g_signal_connect (m_widget, "focus", + G_CALLBACK (gtk_dialog_focus_callback), this); - gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event", - GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this ); + m_time = gtk_get_current_event_time(); - return TRUE; + g_signal_connect (m_widget, "button_press_event", + G_CALLBACK (gtk_popup_button_press), this); + + return true; } void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) @@ -235,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; @@ -286,21 +284,22 @@ 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 ); } } if ((m_width != old_width) || (m_height != old_height)) { - gtk_widget_set_usize( m_widget, m_width, m_height ); + gtk_widget_set_size_request( m_widget, m_width, m_height ); /* 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 ) @@ -334,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 );