X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..fc9361e3ec5b81a7e8c32d93a03aea0b2cd3e045:/src/gtk/popupwin.cpp diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 599d775636..6e1048917c 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,23 @@ // 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" -#include +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/frame.h" + #include "wx/cursor.h" +#endif // WX_PRECOMP + #include -#include #include "wx/gtk/win_gtk.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // "button_press" //----------------------------------------------------------------------------- @@ -43,19 +33,22 @@ 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) - { - if (child == widget) - return FALSE; + { + if (child == widget) + return FALSE; child = child->parent; } } @@ -69,22 +62,6 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo } } -//----------------------------------------------------------------------------- -// "focus" from m_window -//----------------------------------------------------------------------------- - -extern "C" { -static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - // This disables GTK's tab traversal - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" ); - return TRUE; -} -} - //----------------------------------------------------------------------------- // "delete_event" //----------------------------------------------------------------------------- @@ -92,9 +69,6 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU extern "C" { bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (win->IsEnabled()) win->Close(); @@ -102,27 +76,6 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED } } -//----------------------------------------------------------------------------- -// "size_allocate" -//----------------------------------------------------------------------------- - -extern "C" { -static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxPopupWindow *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return; - - if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) - { - win->m_width = alloc->width; - win->m_height = alloc->height; - win->GtkUpdateSize(); - } -} -} - //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- @@ -134,9 +87,6 @@ extern "C" { static gint gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); - /* all this is for Motif Window Manager "hints" and is supposed to be recognized by other WM as well. not tested. */ long decor = (long) GDK_DECOR_BORDER; @@ -145,7 +95,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; } @@ -160,14 +110,14 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win ) * virtual function here as wxWidgets requires different ways to insert * a child in container classes. */ -static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child ) +static void wxInsertChildInPopupWin(wxWindowGTK* parent, wxWindowGTK* child) { gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), - GTK_WIDGET(child->m_widget), - child->m_x, - child->m_y, - child->m_width, - child->m_height ); + child->m_widget, + child->m_x, + child->m_y, + child->m_width, + child->m_height ); if (parent->HasFlag(wxTAB_TRAVERSAL)) { @@ -193,19 +143,22 @@ wxPopupWindow::~wxPopupWindow() bool wxPopupWindow::Create( wxWindow *parent, int style ) { - m_needParent = FALSE; + m_sizeSet = 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. + m_isShown = false; + // All dialogs should really have this style m_windowStyle |= wxTAB_TRAVERSAL; - m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog; + m_insertCallback = wxInsertChildInPopupWin; m_widget = gtk_window_new( GTK_WINDOW_POPUP ); @@ -214,8 +167,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 ); @@ -229,21 +182,15 @@ 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); - // the user resized the frame by dragging etc. - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this ); + m_time = gtk_get_current_event_time(); - // 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, "button_press_event", + G_CALLBACK (gtk_popup_button_press), this); - gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event", - GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this ); - - return TRUE; + return true; } void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) @@ -257,7 +204,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; @@ -292,15 +239,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag } */ - int minWidth = GetMinWidth(), - minHeight = GetMinHeight(), - maxWidth = GetMaxWidth(), - maxHeight = GetMaxHeight(); - - if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; - if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; - if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth; - if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight; + ConstrainSize(); if ((m_x != -1) || (m_y != -1)) { @@ -308,51 +247,40 @@ 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 ) +void wxPopupWindow::GtkOnSize() { - // due to a bug in gtk, x,y are always 0 - // m_x = x; - // m_y = y; - - if ((m_height == height) && (m_width == width) && (m_sizeSet)) return; + if (m_sizeSet) return; if (!m_wxwindow) return; - m_width = width; - m_height = height; - /* FIXME: is this a hack? */ - /* since for some reason GTK will revert to using maximum size ever set - for this window, we have to set geometry hints maxsize to match - size given. */ - int minWidth = GetMinWidth(), - minHeight = GetMinHeight(); - - if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; - if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; + /* Since for some reason GTK will revert to using maximum size ever set + for this window, we have to set geometry hints maxsize to match size + given. Also set the to that minsize since resizing isn't possible + anyway. */ /* set size hints */ - gint flag = GDK_HINT_MAX_SIZE; // GDK_HINT_POS; - if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; + gint flag = GDK_HINT_MAX_SIZE | GDK_HINT_MIN_SIZE; // GDK_HINT_POS; GdkGeometry geom; - geom.min_width = minWidth; - geom.min_height = minHeight; + geom.min_width = m_width; + geom.min_height = m_height; geom.max_width = m_width; geom.max_height = m_height; gtk_window_set_geometry_hints( GTK_WINDOW(m_widget), @@ -361,7 +289,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 ); @@ -371,7 +299,7 @@ void wxPopupWindow::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int void wxPopupWindow::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) - GtkOnSize( m_x, m_y, m_width, m_height ); + GtkOnSize(); wxWindow::OnInternalIdle(); } @@ -385,11 +313,11 @@ bool wxPopupWindow::Show( bool show ) much ugly flicker nor from within the size_allocate handler, because GTK 1.1.X forbids that. */ - GtkOnSize( m_x, m_y, m_width, m_height ); + GtkOnSize(); } - + bool ret = wxWindow::Show( show ); - + return ret; }