← Back to branch summary

~ps-jenkins/ido/latestsnapshot

« back to all changes in this revision

Viewing changes to src/idomessagedialog.c

  • Committer: Charles Kerr
  • Date: 2012-08-22 14:57:08 UTC
  • mfrom: (109.3.6 nogtk2)
  • Revision ID: charles.kerr@canonical.com-20120822145708-z9bp0kc26w135sp6
merge lp:~charlesk/ido/nogtk2 to remove gtk2 support from the configure script and the source

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/idomessagedialog.c
167
167
      IdoTimeline *timeline;
168
168
      IdoMessageDialogMorphContext *context;
169
169
 
170
 
#ifdef USE_GTK3
171
170
      gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &start);
172
 
#else
173
 
      gtk_widget_get_requisition (GTK_WIDGET (dialog), &start);
174
 
#endif
175
171
 
176
172
      priv->expanded = TRUE;
177
173
 
178
174
      gtk_widget_show (priv->action_area);
179
175
      gtk_widget_show (priv->secondary_label);
180
176
 
181
 
#ifdef USE_GTK3
182
177
      gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &end);
183
 
#else
184
 
      gtk_widget_get_requisition (GTK_WIDGET (dialog), &end);
185
 
#endif
186
178
 
187
179
      gtk_widget_hide (priv->action_area);
188
180
      gtk_widget_hide (priv->secondary_label);
289
281
                         NULL);
290
282
  dialog = GTK_DIALOG (widget);
291
283
 
292
 
#if ! GTK_CHECK_VERSION(3, 0, 0)
293
 
  if (flags & GTK_DIALOG_NO_SEPARATOR)
294
 
    {
295
 
      g_warning ("The GTK_DIALOG_NO_SEPARATOR flag cannot be used for IdoMessageDialog");
296
 
      flags &= ~GTK_DIALOG_NO_SEPARATOR;
297
 
    }
298
 
#endif
299
 
 
300
284
  if (message_format)
301
285
    {
302
286
      va_start (args, message_format);
379
363
 
380
364
  for (list = children; list != NULL; list = list->next)
381
365
    {
382
 
#ifdef USE_GTK3
383
366
      if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (list->data) == GTK_ORIENTATION_HORIZONTAL)
384
 
#else
385
 
      if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_HBOX)
386
 
#endif
387
367
        {
388
368
          GList *hchildren;
389
369
          GList *hlist;
393
373
 
394
374
          for (hlist = hchildren; hlist != NULL; hlist = hlist->next)
395
375
            {
396
 
#ifdef USE_GTK3
397
376
              if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (hlist->data) == GTK_ORIENTATION_VERTICAL)
398
 
#else
399
 
              if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_VBOX)
400
 
#endif
401
377
                {
402
378
                  GList *vlist;
403
379
                  GtkWidget *vbox = GTK_WIDGET (hlist->data);