/////////////////////////////////////////////////////////////////////////////
-// Name: popupwin.cpp
+// Name: src/gtk/popupwin.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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 <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"
//-----------------------------------------------------------------------------
{
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;
}
}
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;
}
}
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;
}
static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* 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 );
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
+ child->m_y,
+ child->m_width,
+ child->m_height );
if (parent->HasFlag(wxTAB_TRAVERSAL))
{
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.
+ m_isShown = false;
+
// All dialogs should really have this style
m_windowStyle |= wxTAB_TRAVERSAL;
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 );
/* 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 );
-
- return TRUE;
+ m_time = gtk_get_current_event_time();
+
+ 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) )
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;
{
/* 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 )
(GdkWindowHints) flag );
- m_sizeSet = TRUE;
+ m_sizeSet = true;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
GtkOnSize( m_x, m_y, m_width, m_height );
}
-
+
bool ret = wxWindow::Show( show );
-
+
return ret;
}
projects / wxWidgets.git / blobdiff