diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-08-22 09:57:08 -0500 |
commit | 2481b74fa64122365eef5293ae86d71b5fae3fa6 (patch) | |
tree | cc3845ff2ee2c8ec173b072de9fabe29670588c4 /src/idomessagedialog.c | |
parent | 8f279d3f26f588bb022f3f0d05edff6858035eab (diff) | |
parent | 73302803e066d8d36e425feda15f57fca44f4bc5 (diff) | |
download | ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.gz ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.tar.bz2 ayatana-ido-2481b74fa64122365eef5293ae86d71b5fae3fa6.zip |
merge lp:~charlesk/ido/nogtk2 to remove gtk2 support from the configure script and the source
Diffstat (limited to 'src/idomessagedialog.c')
-rw-r--r-- | src/idomessagedialog.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c index d4a3e2f..41ff2e7 100644 --- a/src/idomessagedialog.c +++ b/src/idomessagedialog.c @@ -167,22 +167,14 @@ ido_message_dialog_focus_in_event (GtkWidget *widget, IdoTimeline *timeline; IdoMessageDialogMorphContext *context; -#ifdef USE_GTK3 gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &start); -#else - gtk_widget_get_requisition (GTK_WIDGET (dialog), &start); -#endif priv->expanded = TRUE; gtk_widget_show (priv->action_area); gtk_widget_show (priv->secondary_label); -#ifdef USE_GTK3 gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &end); -#else - gtk_widget_get_requisition (GTK_WIDGET (dialog), &end); -#endif gtk_widget_hide (priv->action_area); gtk_widget_hide (priv->secondary_label); @@ -289,14 +281,6 @@ ido_message_dialog_new (GtkWindow *parent, NULL); dialog = GTK_DIALOG (widget); -#if ! GTK_CHECK_VERSION(3, 0, 0) - if (flags & GTK_DIALOG_NO_SEPARATOR) - { - g_warning ("The GTK_DIALOG_NO_SEPARATOR flag cannot be used for IdoMessageDialog"); - flags &= ~GTK_DIALOG_NO_SEPARATOR; - } -#endif - if (message_format) { va_start (args, message_format); @@ -379,11 +363,7 @@ ido_message_dialog_get_label (IdoMessageDialog *dialog, gboolean primary) for (list = children; list != NULL; list = list->next) { -#ifdef USE_GTK3 if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (list->data) == GTK_ORIENTATION_HORIZONTAL) -#else - if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_HBOX) -#endif { GList *hchildren; GList *hlist; @@ -393,11 +373,7 @@ ido_message_dialog_get_label (IdoMessageDialog *dialog, gboolean primary) for (hlist = hchildren; hlist != NULL; hlist = hlist->next) { -#ifdef USE_GTK3 if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (hlist->data) == GTK_ORIENTATION_VERTICAL) -#else - if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_VBOX) -#endif { GList *vlist; GtkWidget *vbox = GTK_WIDGET (hlist->data); |