add xthickness and ythickness to GtkRcStyle and add the necessary tokens.

Tue Jul 11 06:38:42 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtkrc.h: add xthickness and ythickness to GtkRcStyle and
        add the necessary tokens.

        * gtk/gtkrc.c (gtk_rc_style_init): properly initiality the rc style.
        (gtk_rc_style_to_style): copy thicknesses.
        (gtk_rc_init_style): apply thicknesses.
        (gtk_rc_parse_style): parse xthickness and ythickness.

        * gdk/x11/gdkdnd-x11.c: silence compiler in switch() statements.

        * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new):
        (gdk_window_new):
        (_gdk_windowing_window_init):
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new):
        (gdk_pixmap_create_from_data):
        (gdk_bitmap_create_from_data):
        (gdk_pixmap_new):
        * gdk/x11/gdkimage-x11.c (gdk_image_get):
        (gdk_image_new):
        * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new):
        * gdk/x11/gdkdnd-x11.c (gdk_drag_context_new):
        * gdk/x11/gdkcolor-x11.c (gdkx_colormap_get):
        (gdk_colormap_get_system):
        (gdk_colormap_new):
        * gdk/gdkwindow.c (gdk_window_init):
        * gtk/gtkstyle.c (gtk_style_new):
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done):
        * gdk/gdkpixmap.c (gdk_pixmap_init):
        * gtk/gtkrc.c (gtk_rc_style_new):
        use g_object_new() instead of g_type_create_instance() which
        is a private function for fundamental type implementations.

Tue Jul 11 06:20:14 2000  Tim Janik  <timj@gtk.org>

        * io-gif.c (gdk_pixbuf__gif_image_load_animation):
        * gdk-pixbuf-data.c (gdk_pixbuf_new_from_data):
        * gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file):
        use g_object_new() instead of g_type_create_instance() which
        is a private function for fundamental type implementations.

1 files changed, 12 insertions, 6 deletions

diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 2991326ca..8fc54b1e7 100644
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -42,11 +42,12 @@ extern "C" {
 #define GTK_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RC_STYLE))
 #define GTK_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
 
-typedef enum {
-  GTK_RC_FG   = 1 << 0,
-  GTK_RC_BG   = 1 << 1,
-  GTK_RC_TEXT = 1 << 2,
-  GTK_RC_BASE = 1 << 3
+typedef enum
+{
+  GTK_RC_FG		= 1 << 0,
+  GTK_RC_BG		= 1 << 1,
+  GTK_RC_TEXT		= 1 << 2,
+  GTK_RC_BASE		= 1 << 3
 } GtkRcFlags;
 
 typedef struct _GtkRcStyleClass GtkRcStyleClass;
@@ -67,6 +68,9 @@ struct _GtkRcStyle
   GdkColor   text[5];
   GdkColor   base[5];
 
+  gint xthickness;
+  gint ythickness;
+
   GtkThemeEngine *engine;
   gpointer        engine_data;
 
@@ -132,8 +136,10 @@ typedef enum {
   GTK_RC_TOKEN_INSENSITIVE,
   GTK_RC_TOKEN_FG,
   GTK_RC_TOKEN_BG,
-  GTK_RC_TOKEN_BASE,
   GTK_RC_TOKEN_TEXT,
+  GTK_RC_TOKEN_BASE,
+  GTK_RC_TOKEN_XTHICKNESS,
+  GTK_RC_TOKEN_YTHICKNESS,
   GTK_RC_TOKEN_FONT,
   GTK_RC_TOKEN_FONTSET,
   GTK_RC_TOKEN_FONT_NAME,