// 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"
// "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);
if (child != widget)
{
while (child)
- {
- if (child == widget)
- return FALSE;
+ {
+ if (child == widget)
+ return FALSE;
child = child->parent;
}
}
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)
wxapp_install_idle_handler();
// This disables GTK's tab traversal
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
+ g_signal_stop_emission_by_name (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 )
{
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// InsertChild for wxPopupWindow
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))
{
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 );
-
- // 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 );
+ 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);
+
+ 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;
}
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_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),
GtkOnSize( m_x, m_y, m_width, m_height );
}
-
+
bool ret = wxWindow::Show( show );
-
+
return ret;
}
projects / wxWidgets.git / blobdiff