#include "gtkdialog.h"
#include "gtkhbbox.h"
#include "gtkhseparator.h"
+#include "gtkmarshalers.h"
#include "gtkvbox.h"
-#include "gtksignal.h"
#include "gdkkeysyms.h"
#include "gtkmain.h"
#include "gtkintl.h"
#include "gtkbindings.h"
+typedef struct _ResponseData ResponseData;
+
+struct _ResponseData
+{
+ gint response_id;
+};
+
static void gtk_dialog_class_init (GtkDialogClass *klass);
static void gtk_dialog_init (GtkDialog *dialog);
GParamSpec *pspec);
static void gtk_dialog_style_set (GtkWidget *widget,
GtkStyle *prev_style);
+static void gtk_dialog_map (GtkWidget *widget);
static void gtk_dialog_close (GtkDialog *dialog);
+static ResponseData* get_response_data (GtkWidget *widget);
+
enum {
PROP_0,
PROP_HAS_SEPARATOR
static gpointer parent_class;
static guint dialog_signals[LAST_SIGNAL];
-GtkType
+GType
gtk_dialog_get_type (void)
{
- static GtkType dialog_type = 0;
+ static GType dialog_type = 0;
if (!dialog_type)
{
- static const GtkTypeInfo dialog_info =
+ static const GTypeInfo dialog_info =
{
- "GtkDialog",
- sizeof (GtkDialog),
sizeof (GtkDialogClass),
- (GtkClassInitFunc) gtk_dialog_class_init,
- (GtkObjectInitFunc) gtk_dialog_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_dialog_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkDialog),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_dialog_init,
};
- dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &dialog_info);
+ dialog_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkDialog",
+ &dialog_info, 0);
}
return dialog_type;
gtk_dialog_class_init (GtkDialogClass *class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkBindingSet *binding_set;
gobject_class = G_OBJECT_CLASS (class);
- object_class = GTK_OBJECT_CLASS (class);
widget_class = GTK_WIDGET_CLASS (class);
parent_class = g_type_class_peek_parent (class);
gobject_class->set_property = gtk_dialog_set_property;
gobject_class->get_property = gtk_dialog_get_property;
+ widget_class->map = gtk_dialog_map;
widget_class->style_set = gtk_dialog_style_set;
class->close = gtk_dialog_close;
G_PARAM_READWRITE));
dialog_signals[RESPONSE] =
- gtk_signal_new ("response",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkDialogClass, response),
- gtk_marshal_NONE__INT,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_INT);
+ g_signal_new ("response",
+ G_OBJECT_CLASS_TYPE (class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkDialogClass, response),
+ NULL, NULL,
+ _gtk_marshal_NONE__INT,
+ G_TYPE_NONE, 1,
+ G_TYPE_INT);
dialog_signals[CLOSE] =
- gtk_signal_new ("close",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkDialogClass, close),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("close",
+ G_OBJECT_CLASS_TYPE (class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkDialogClass, close),
+ NULL, NULL,
+ _gtk_marshal_NONE__NONE,
+ G_TYPE_NONE, 0);
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content_area_border",
* by connecting a handler, we have to have the FIRST signal
* connection on the dialog.
*/
- gtk_signal_connect (GTK_OBJECT (dialog),
- "delete_event",
- GTK_SIGNAL_FUNC (gtk_dialog_delete_event_handler),
- NULL);
+ g_signal_connect (dialog,
+ "delete_event",
+ G_CALLBACK (gtk_dialog_delete_event_handler),
+ NULL);
dialog->vbox = gtk_vbox_new (FALSE, 0);
gtk_window_set_type_hint (GTK_WINDOW (dialog),
GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
}
return FALSE;
}
+/* A far too tricky heuristic for getting the right initial
+ * focus widget if none was set. What we do is we focus the first
+ * widget in the tab chain, but if this results in the focus
+ * ending up on one of the response widgets _other_ than the
+ * default response, we focus the default response instead.
+ */
+static void
+gtk_dialog_map (GtkWidget *widget)
+{
+ GtkWindow *window = GTK_WINDOW (widget);
+ GtkDialog *dialog = GTK_DIALOG (widget);
+
+ GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+ if (!window->focus_widget)
+ {
+ GList *children, *tmp_list;
+
+ g_signal_emit_by_name (window, "move_focus", GTK_DIR_TAB_FORWARD);
+
+ tmp_list = children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
+
+ while (tmp_list)
+ {
+ GtkWidget *child = tmp_list->data;
+
+ if (child == window->focus_widget && child != window->default_widget && window->default_widget)
+ {
+ gtk_widget_grab_focus (window->default_widget);
+ break;
+ }
+
+ tmp_list = tmp_list->next;
+ }
+
+ g_list_free (children);
+ }
+}
+
static void
gtk_dialog_style_set (GtkWidget *widget,
GtkStyle *prev_style)
update_spacings (GTK_DIALOG (widget));
}
+static gboolean
+dialog_has_cancel (GtkDialog *dialog)
+{
+ GList *children, *tmp_list;
+ gboolean ret = FALSE;
+
+ children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
+
+ for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
+ {
+ ResponseData *rd = get_response_data (tmp_list->data);
+
+ if (rd && rd->response_id == GTK_RESPONSE_CANCEL)
+ {
+ ret = TRUE;
+ break;
+ }
+ }
+
+ g_list_free (children);
+
+ return ret;
+}
+
static void
gtk_dialog_close (GtkDialog *dialog)
{
/* Synthesize delete_event to close dialog. */
- GdkEventAny event;
- GtkWidget *widget;
+ GtkWidget *widget = GTK_WIDGET (dialog);
+ GdkEvent *event;
- widget = GTK_WIDGET (dialog);
-
- event.type = GDK_DELETE;
- event.window = widget->window;
- event.send_event = TRUE;
-
- g_object_ref (G_OBJECT (event.window));
+ if (!dialog_has_cancel (dialog))
+ return;
+
+ event = gdk_event_new (GDK_DELETE);
- gtk_main_do_event ((GdkEvent*)&event);
+ event->any.window = g_object_ref (widget->window);
+ event->any.send_event = TRUE;
- g_object_unref (G_OBJECT (event.window));
+ gtk_main_do_event (event);
+ gdk_event_free (event);
}
GtkWidget*
gtk_dialog_new (void)
{
- return GTK_WIDGET (gtk_type_new (GTK_TYPE_DIALOG));
+ return g_object_new (GTK_TYPE_DIALOG, NULL);
}
static GtkWidget*
{
GtkDialog *dialog;
- dialog = GTK_DIALOG (g_object_new (GTK_TYPE_DIALOG, NULL));
+ dialog = g_object_new (GTK_TYPE_DIALOG, NULL);
if (title)
gtk_window_set_title (GTK_WINDOW (dialog), title);
/**
* gtk_dialog_new_with_buttons:
- * @title: Title of the dialog, or NULL
- * @parent: Transient parent of the dialog, or NULL
+ * @title: Title of the dialog, or %NULL
+ * @parent: Transient parent of the dialog, or %NULL
* @flags: from #GtkDialogFlags
- * @first_button_text: stock ID or text to go in first button, or NULL
- * @Varargs: response ID for first button, then additional buttons, ending with NULL
+ * @first_button_text: stock ID or text to go in first button, or %NULL
+ * @Varargs: response ID for first button, then additional buttons, ending with %NULL
*
- * Creates a new #GtkDialog with title @title (or NULL for the default
+ * Creates a new #GtkDialog with title @title (or %NULL for the default
* title; see gtk_window_set_title()) and transient parent @parent (or
- * NULL for none; see gtk_window_set_transient_for()). The @flags
- * argument can be used to make the dialog modal (GTK_DIALOG_MODAL)
+ * %NULL for none; see gtk_window_set_transient_for()). The @flags
+ * argument can be used to make the dialog modal (#GTK_DIALOG_MODAL)
* and/or to have it destroyed along with its transient parent
- * (GTK_DIALOG_DESTROY_WITH_PARENT). After @flags, button
- * text/response ID pairs should be listed, with a NULL pointer ending
+ * (#GTK_DIALOG_DESTROY_WITH_PARENT). After @flags, button
+ * text/response ID pairs should be listed, with a %NULL pointer ending
* the list. Button text can be either a stock ID such as
* #GTK_STOCK_OK, or some arbitrary text. A response ID can be
* any positive number, or one of the values in the #GtkResponseType
* enumeration. If the user clicks one of these dialog buttons,
* #GtkDialog will emit the "response" signal with the corresponding
* response ID. If a #GtkDialog receives the "delete_event" signal, it
- * will emit "response" with a response ID of GTK_RESPONSE_DELETE_EVENT.
+ * will emit "response" with a response ID of #GTK_RESPONSE_DELETE_EVENT.
* However, destroying a dialog does not emit the "response" signal;
* so be careful relying on "response" when using
- * the GTK_DIALOG_DESTROY_WITH_PARENT flag. Buttons are from left to right,
+ * the #GTK_DIALOG_DESTROY_WITH_PARENT flag. Buttons are from left to right,
* so the first button in the list will be the leftmost button in the dialog.
*
* Here's a simple example:
- * <programlisting>
+ * <informalexample><programlisting>
* GtkWidget *dialog = gtk_dialog_new_with_buttons ("My dialog",
* main_app_window,
* GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
* GTK_STOCK_CANCEL,
* GTK_RESPONSE_REJECT,
* NULL);
- * </programlisting>
+ * </programlisting></informalexample>
*
* Return value: a new #GtkDialog
**/
return GTK_WIDGET (dialog);
}
-typedef struct _ResponseData ResponseData;
-
-struct _ResponseData
-{
- gint response_id;
-};
-
static ResponseData*
get_response_data (GtkWidget *widget)
{
- ResponseData *ad = gtk_object_get_data (GTK_OBJECT (widget),
- "gtk-dialog-response-data");
+ ResponseData *ad = g_object_get_data (G_OBJECT (widget),
+ "gtk-dialog-response-data");
if (ad == NULL)
{
ad = g_new (ResponseData, 1);
- gtk_object_set_data_full (GTK_OBJECT (widget),
- "gtk-dialog-response-data",
- ad,
- g_free);
+ g_object_set_data_full (G_OBJECT (widget),
+ "gtk-dialog-response-data",
+ ad,
+ g_free);
}
return ad;
gtk_dialog_response (dialog, response_id);
}
+
/**
* gtk_dialog_add_action_widget:
* @dialog: a #GtkDialog
* the end of the dialog's action area. If you want to add a
* non-activatable widget, simply pack it into the
* <literal>action_area</literal> field of the #GtkDialog struct.
- *
**/
void
-gtk_dialog_add_action_widget (GtkDialog *dialog,
- GtkWidget *child,
- gint response_id)
+gtk_dialog_add_action_widget (GtkDialog *dialog,
+ GtkWidget *child,
+ gint response_id)
{
ResponseData *ad;
gint signal_id = 0;
ad->response_id = response_id;
if (GTK_IS_BUTTON (child))
- {
- signal_id = g_signal_lookup ("clicked", GTK_TYPE_BUTTON);
- }
+ signal_id = g_signal_lookup ("clicked", GTK_TYPE_BUTTON);
else
signal_id = GTK_WIDGET_GET_CLASS (child)->activate_signal != 0;
if (signal_id)
{
- const gchar* name = gtk_signal_name (signal_id);
-
- gtk_signal_connect_while_alive (GTK_OBJECT (child),
- name,
- GTK_SIGNAL_FUNC (action_widget_activated),
- dialog,
- GTK_OBJECT (dialog));
+ GClosure *closure;
+
+ closure = g_cclosure_new_object (G_CALLBACK (action_widget_activated),
+ G_OBJECT (dialog));
+ g_signal_connect_closure_by_id (child,
+ signal_id,
+ 0,
+ closure,
+ FALSE);
}
else
g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkDialog");
}
static void
-gtk_dialog_add_buttons_valist(GtkDialog *dialog,
- const gchar *first_button_text,
- va_list args)
+gtk_dialog_add_buttons_valist (GtkDialog *dialog,
+ const gchar *first_button_text,
+ va_list args)
{
const gchar* text;
gint response_id;
* @Varargs: response ID for first button, then more text-response_id pairs
*
* Adds more buttons, same as calling gtk_dialog_add_button()
- * repeatedly. The variable argument list should be NULL-terminated
+ * repeatedly. The variable argument list should be %NULL-terminated
* as with gtk_dialog_new_with_buttons(). Each button must have both
* text and response ID.
- *
**/
void
gtk_dialog_add_buttons (GtkDialog *dialog,
* @response_id: a response ID
* @setting: %TRUE for sensitive
*
- * Calls gtk_widget_set_sensitive (widget, @setting) for each
- * widget in the dialog's action area with the given @response_id.
+ * Calls <literal>gtk_widget_set_sensitive (widget, @setting)</literal>
+ * for each widget in the dialog's action area with the given @response_id.
* A convenient way to sensitize/desensitize dialog buttons.
- *
**/
void
gtk_dialog_set_response_sensitive (GtkDialog *dialog,
GList *children;
GList *tmp_list;
- children = gtk_container_children (GTK_CONTAINER (dialog));
+ g_return_if_fail (GTK_IS_DIALOG (dialog));
+
+ children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
tmp_list = children;
while (tmp_list != NULL)
* Sets the last widget in the dialog's action area with the given @response_id
* as the default widget for the dialog. Pressing "Enter" normally activates
* the default widget.
- *
**/
void
gtk_dialog_set_default_response (GtkDialog *dialog,
GList *children;
GList *tmp_list;
- children = gtk_container_children (GTK_CONTAINER (dialog->action_area));
+ g_return_if_fail (GTK_IS_DIALOG (dialog));
+
+ children = gtk_container_get_children (GTK_CONTAINER (dialog->action_area));
tmp_list = children;
while (tmp_list != NULL)
"gtk-dialog-response-data");
if (rd && rd->response_id == response_id)
- {
- gtk_widget_grab_default (widget);
-
- if (!GTK_WINDOW (dialog)->focus_widget)
- gtk_widget_grab_focus (widget);
- }
+ gtk_widget_grab_default (widget);
tmp_list = g_list_next (tmp_list);
}
g_list_free (children);
}
+/**
+ * gtk_dialog_set_has_separator:
+ * @dialog: a #GtkDialog
+ * @setting: %TRUE to have a separator
+ *
+ * Sets whether the dialog has a separator above the buttons.
+ * %TRUE by default.
+ **/
void
gtk_dialog_set_has_separator (GtkDialog *dialog,
gboolean setting)
g_object_notify (G_OBJECT (dialog), "has_separator");
}
+/**
+ * gtk_dialog_get_has_separator:
+ * @dialog: a #GtkDialog
+ *
+ * Accessor for whether the dialog has a separator.
+ *
+ * Return value: %TRUE if the dialog has a separator
+ **/
gboolean
gtk_dialog_get_has_separator (GtkDialog *dialog)
{
{
g_return_if_fail (GTK_IS_DIALOG (dialog));
- gtk_signal_emit (GTK_OBJECT (dialog),
- dialog_signals[RESPONSE],
- response_id);
+ g_signal_emit (dialog,
+ dialog_signals[RESPONSE],
+ 0,
+ response_id);
}
typedef struct
GtkDialog *dialog;
gint response_id;
GMainLoop *loop;
+ gboolean destroyed;
} RunInfo;
static void
return TRUE; /* Do not destroy */
}
+static void
+run_destroy_handler (GtkDialog *dialog, gpointer data)
+{
+ RunInfo *ri = data;
+
+ /* shutdown_loop will be called by run_unmap_handler */
+
+ ri->destroyed = TRUE;
+}
+
/**
* gtk_dialog_run:
* @dialog: a #GtkDialog
*
* Blocks in a recursive main loop until the @dialog either emits the
- * response signal, or is destroyed. If the dialog is destroyed,
- * gtk_dialog_run() returns GTK_RESPONSE_NONE. Otherwise, it returns
- * the response ID from the "response" signal emission. Before
- * entering the recursive main loop, gtk_dialog_run() calls
+ * response signal, or is destroyed. If the dialog is destroyed during the call
+ * to gtk_dialog_run(), gtk_dialog_returns #GTK_RESPONSE_NONE.
+ * Otherwise, it returns the response ID from the "response" signal emission.
+ * Before entering the recursive main loop, gtk_dialog_run() calls
* gtk_widget_show() on the dialog for you. Note that you still
* need to show any children of the dialog yourself.
*
* During gtk_dialog_run(), the default behavior of "delete_event" is
* disabled; if the dialog receives "delete_event", it will not be
* destroyed as windows usually are, and gtk_dialog_run() will return
- * GTK_RESPONSE_DELETE_EVENT. Also, during gtk_dialog_run() the dialog will be
+ * #GTK_RESPONSE_DELETE_EVENT. Also, during gtk_dialog_run() the dialog will be
* modal. You can force gtk_dialog_run() to return at any time by
* calling gtk_dialog_response() to emit the "response"
* signal. Destroying the dialog during gtk_dialog_run() is a very bad
* destroying the dialog if you wish to do so.
*
* Typical usage of this function might be:
- * <programlisting>
+ * <informalexample><programlisting>
* gint result = gtk_dialog_run (GTK_DIALOG (dialog));
* switch (result)
* {
* case GTK_RESPONSE_ACCEPT:
- * do_application_specific_something ();
+ * do_application_specific_something (<!-- -->);
* break;
* default:
- * do_nothing_since_dialog_was_cancelled ();
+ * do_nothing_since_dialog_was_cancelled (<!-- -->);
* break;
* }
* gtk_widget_destroy (dialog);
- * </programlisting>
+ * </programlisting></informalexample>
*
* Return value: response ID
**/
{
RunInfo ri = { NULL, GTK_RESPONSE_NONE, NULL };
gboolean was_modal;
- guint response_handler;
- guint destroy_handler;
- guint delete_handler;
+ gulong response_handler;
+ gulong unmap_handler;
+ gulong destroy_handler;
+ gulong delete_handler;
g_return_val_if_fail (GTK_IS_DIALOG (dialog), -1);
- gtk_object_ref (GTK_OBJECT (dialog));
+ g_object_ref (dialog);
if (!GTK_WIDGET_VISIBLE (dialog))
gtk_widget_show (GTK_WIDGET (dialog));
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
response_handler =
- gtk_signal_connect (GTK_OBJECT (dialog),
- "response",
- GTK_SIGNAL_FUNC (run_response_handler),
- &ri);
+ g_signal_connect (dialog,
+ "response",
+ G_CALLBACK (run_response_handler),
+ &ri);
- destroy_handler =
- gtk_signal_connect (GTK_OBJECT (dialog),
- "unmap",
- GTK_SIGNAL_FUNC (run_unmap_handler),
- &ri);
+ unmap_handler =
+ g_signal_connect (dialog,
+ "unmap",
+ G_CALLBACK (run_unmap_handler),
+ &ri);
delete_handler =
- gtk_signal_connect (GTK_OBJECT (dialog),
- "delete_event",
- GTK_SIGNAL_FUNC (run_delete_handler),
- &ri);
+ g_signal_connect (dialog,
+ "delete_event",
+ G_CALLBACK (run_delete_handler),
+ &ri);
- ri.loop = g_main_new (FALSE);
+ destroy_handler =
+ g_signal_connect (dialog,
+ "destroy",
+ G_CALLBACK (run_destroy_handler),
+ &ri);
+
+ ri.loop = g_main_loop_new (NULL, FALSE);
GDK_THREADS_LEAVE ();
g_main_loop_run (ri.loop);
g_main_loop_unref (ri.loop);
ri.loop = NULL;
+ ri.destroyed = FALSE;
- if (!GTK_OBJECT_DESTROYED (dialog))
+ if (!ri.destroyed)
{
if (!was_modal)
gtk_window_set_modal (GTK_WINDOW(dialog), FALSE);
- gtk_signal_disconnect (GTK_OBJECT (dialog), destroy_handler);
- gtk_signal_disconnect (GTK_OBJECT (dialog), response_handler);
- gtk_signal_disconnect (GTK_OBJECT (dialog), delete_handler);
+ g_signal_handler_disconnect (dialog, response_handler);
+ g_signal_handler_disconnect (dialog, unmap_handler);
+ g_signal_handler_disconnect (dialog, delete_handler);
+ g_signal_handler_disconnect (dialog, destroy_handler);
}
- gtk_object_unref (GTK_OBJECT (dialog));
+ g_object_unref (dialog);
return ri.response_id;
}
-
-
-
-
projects / ~andy / gtk / blobdiff