GtkStyleKey / GtkStyle

[Jost Boekemeier <jostobfe linux zrz TU-Berlin DE>]

Hi,

what about moving the definition of _GtkStyleKey from gtkstyle.c to
gtkstyle.h and define _GtkStyle as follows:

--- gtkstyle.h ---
struct _GtkStyleKey
{
  GdkColor fg[5];
  GdkColor bg[5];
  GdkColor text[5];
  GdkColor base[5];

  GdkPixmap *bg_pixmap[5];

  GdkFont *font;

  gint depth;
  GdkColormap *colormap;
  GtkStyleClass *klass;
};

struct _GtkStyle
{
  /* inherited from GtkStyleKey */
  GdkColor fg[5];
  GdkColor bg[5];
  GdkColor text[5];
  GdkColor base[5];

  GdkPixmap *bg_pixmap[5];

  GdkFont *font;

  gint depth;
  GdkColormap *colormap;
  GtkStyleClass *klass;


  /* New entries */
  GdkColor light[5];
  GdkColor dark[5];
  GdkColor mid[5];

  GdkColor black;
  GdkColor white;

  GdkGC *fg_gc[5];
  GdkGC *bg_gc[5];
  GdkGC *light_gc[5];
  GdkGC *dark_gc[5];
  GdkGC *mid_gc[5];
  GdkGC *text_gc[5];
  GdkGC *base_gc[5];
  GdkGC *black_gc;
  GdkGC *white_gc;

  gint ref_count;
  gint attach_count;
};
---------------------------

Previously Gtkstyle was defined as follows
struct _GtkStyle
{
  GdkColor fg[5];
  GdkColor bg[5];
  GdkColor light[5];
...

which is simply wrong as you could not access the depth value for example.


Jost