extern void wxapp_install_idle_handler();
extern bool g_isIdle;
+//-----------------------------------------------------------------------------
+// "button_press"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPopupWindow* win )
+{
+ 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.
+ */
+ if (child != widget)
+ {
+ while (child)
+ {
+ if (child == widget)
+ return FALSE;
+ child = child->parent;
+ }
+ }
+
+ wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
+ event.SetEventObject( win );
+
+ (void)win->GetEventHandler()->ProcessEvent( event );
+
+ return TRUE;
+}
+}
+
//-----------------------------------------------------------------------------
// "focus" from m_window
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
{
if (g_isIdle)
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
+extern "C" {
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxPopupWindow *win )
{
if (g_isIdle)
return TRUE;
}
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
-
-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();
- }
}
//-----------------------------------------------------------------------------
/* we cannot MWM hints and icons before the widget has been realized,
so we do this directly after realization */
+extern "C" {
static gint
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's shrinking/growing policy */
- if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
- gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
- else
- gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
+ gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// InsertChild for wxPopupWindow
#endif
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-
wxPopupWindow::~wxPopupWindow()
{
}
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_signal_connect( GTK_OBJECT(m_widget), "realize",
GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) 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 );
-
- /* disable native tab traversal */
+ // disable native tab traversal
gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
+ gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
+ GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );
+
return TRUE;
}
m_width = width;
m_height = height;
- 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;
+ /* 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. Also set the to that minsize since resizing isn't possible
+ anyway. */
/* set size hints */
- gint flag = 0; // GDK_HINT_POS;
- if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
- if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_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.max_width = maxWidth;
- geom.max_height = maxHeight;
+ 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),
(GtkWidget*) NULL,
&geom,
(GdkWindowHints) flag );
+
m_sizeSet = TRUE;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
projects / wxWidgets.git / blobdiff