gimp-studio/gtk-2.19.1.patch

   1 --- app/display/gimpstatusbar.c.orig
   2 +++ app/display/gimpstatusbar.c
   3 @@ -49,6 +49,9 @@
   4  /*  maximal width of the string holding the cursor-coordinates  */
   5  #define CURSOR_LEN        256
   6
   7 +/*  the spacing of the hbox                                     */
   8 +#define HBOX_SPACING        1
   9 +
  10  /*  spacing between the icon and the statusbar label            */
  11  #define ICON_SPACING        2
  12
  13 @@ -152,6 +155,7 @@ static void
  14  gimp_statusbar_init (GimpStatusbar *statusbar)
  15  {
  16    GtkWidget     *hbox;
  17 +  GtkWidget     *label;
  18    GtkWidget     *image;
  19    GimpUnitStore *store;
  20
  21 @@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
  22    statusbar->progress_active      = FALSE;
  23    statusbar->progress_shown       = FALSE;
  24
  25 -  /* remove the label and insert a hbox */
  26 -  gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame),
  27 -                        g_object_ref (GTK_STATUSBAR (statusbar)->label));
  28 -
  29 -  hbox = gtk_hbox_new (FALSE, 1);
  30 -  gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox);
  31 -  gtk_widget_show (hbox);
  32 +  label = g_object_ref (GTK_STATUSBAR (statusbar)->label);
  33 +
  34 +  /* remove the message area or label and insert a hbox */
  35 +#if GTK_CHECK_VERSION (2, 19, 1)
  36 +  {
  37 +    hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar));
  38 +    gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING);
  39 +    gtk_container_remove (GTK_CONTAINER (hbox), label);
  40 +  }
  41 +#else
  42 +  {
  43 +    GtkWidget *label_parent;
  44 +
  45 +    label_parent = gtk_widget_get_parent (label);
  46 +    gtk_container_remove (GTK_CONTAINER (label_parent), label);
  47 +
  48 +    hbox = gtk_hbox_new (FALSE, HBOX_SPACING);
  49 +    gtk_container_add (GTK_CONTAINER (label_parent), hbox);
  50 +    gtk_widget_show (hbox);
  51 +  }
  52 +#endif
  53
  54    statusbar->cursor_label = gtk_label_new ("8888, 8888");
  55    gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5);