bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
win->Close();
static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return;
// "configure_event"
//-----------------------------------------------------------------------------
-static gint
+static gint
#if (GTK_MINOR_VERSON > 0)
gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
#else
gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
#endif
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE;
// "realize" from m_widget
//-----------------------------------------------------------------------------
-/* we cannot MWM hints and icons before the widget has been realized,
+/* we cannot MWM hints and icons before the widget has been realized,
so we do this directly after realization */
-static gint
+static gint
gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
+ // FIXME I don't know when does it appear, but it's not in 1.2.2
+#if GTK_CHECK_VERSION(1, 2, 3)
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
- gtk_widget_set_uposition( widget, win->m_x, win->m_y );
+ gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
+#endif // GTK > 1.2.2
/* 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;
long func = (long) GDK_FUNC_MOVE ;
-
+
+ /* Some WM don't display any border around the frame contents if
+ used with these hints, so we add a resize border around it,
+ without automatically allowinng it to be resized though.
+
+ This avoids the problem, but looks odd. What shall we do?
+ */
+ decor |= GDK_DECOR_RESIZEH;
+
if ((win->GetWindowStyle() & wxCAPTION) != 0)
decor |= GDK_DECOR_TITLE;
if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
{
decor |= GDK_DECOR_MAXIMIZE;
- func |= GDK_FUNC_MAXIMIZE;
+ func |= GDK_FUNC_MAXIMIZE;
}
if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
{
}
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);
-
+
/* set size hints */
gint flag = GDK_HINT_POS;
if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
if (flag)
{
- gdk_window_set_hints( win->m_widget->window,
+ gdk_window_set_hints( win->m_widget->window,
win->m_x, win->m_y,
win->GetMinWidth(), win->GetMinHeight(),
win->GetMaxWidth(), win->GetMaxHeight(),
win->m_icon = wxNullIcon;
win->SetIcon( icon );
}
-
+
return FALSE;
}
-
+
//-----------------------------------------------------------------------------
// InsertChild for wxDialog
//-----------------------------------------------------------------------------
static void wxInsertChildInDialog( wxDialog* parent, wxWindow* child )
{
- gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+ gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_y,
}
m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
-
- m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-
+
+ m_widget = gtk_window_new( GTK_WINDOW_DIALOG );
+
+ if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget)))
+ gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+
if (!name.IsEmpty())
gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
-
+
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 );
- m_wxwindow = gtk_myfixed_new();
+ m_wxwindow = gtk_pizza_new();
gtk_widget_show( m_wxwindow );
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
wxDialog::~wxDialog()
{
m_isBeingDeleted = TRUE;
-
+
wxTopLevelWindows.DeleteObject( this );
if (wxTheApp->GetTopWindow() == this)
m_height = height;
}
+/*
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
{
if (width == -1) m_width = 80;
{
if (height == -1) m_height = 26;
}
+*/
if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+ // FIXME I don't know when does it appear, but it's not in 1.2.2
+#if GTK_CHECK_VERSION(1, 2, 3)
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_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 );
+ gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
}
}
+#endif // GTK > 1.2.2
if ((m_width != old_width) || (m_height != old_height))
{
}
wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-
+
Show( TRUE );
m_modalShowing = TRUE;
projects / wxWidgets.git / blobdiff