diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-06-21 17:45:26 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-21 17:45:26 +0000 |
| commit | d809ceee2ef2d86e83f274c3040d80a451d86884 (patch) | |
| tree | 7aea2382664bd584566202f67fe8d8e5e761f65f /gtk/gtkrc.c | |
| parent | 9c3c1cd3b514ec9f5aef5b7b19f7acf7a5ccdaea (diff) | |
| download | gtk+-d809ceee2ef2d86e83f274c3040d80a451d86884.tar.gz | |
Handle the case without XKB properly.
Thu Jun 21 13:42:01 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_direction): Handle
the case without XKB properly.
* gtk/gtkrc.c (gtk_rc_set_default_files): Remove
unused gtk_rc_auto_parse variable.
* gtk/gtkrc.[ch] gtk/gtkstyle.c docs/Changes-2.0.txt:
Remove gtk_rc_set_image_loader(), gtk_rc_load_image(), no
longer needed with GdkPixbuf.
* gtk/gtkrc.c (_gtk_rc_init): Make private.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 9480df31ba..4766fa56e1 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -247,7 +247,6 @@ static GSList *gtk_rc_sets_class = NULL; #define GTK_RC_MAX_DEFAULT_FILES 128 static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES]; -static gboolean gtk_rc_auto_parse = TRUE; #define GTK_RC_MAX_PIXMAP_PATHS 128 static gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS]; @@ -262,8 +261,6 @@ static GSList *rc_dir_stack = NULL; /* The files we have parsed, to reread later if necessary */ static GSList *rc_files = NULL; -static GtkImageLoader image_loader = NULL; - /* RC file handling */ @@ -492,7 +489,6 @@ gtk_rc_set_default_files (gchar **files) } gtk_rc_default_files[0] = NULL; - gtk_rc_auto_parse = FALSE; i = 0; while (files[i] != NULL) @@ -560,7 +556,7 @@ gtk_rc_get_default_files (void) } void -gtk_rc_init (void) +_gtk_rc_init (void) { static gboolean initialized = FALSE; static gchar *locale_suffixes[3]; @@ -3276,37 +3272,3 @@ gtk_rc_parse_stock (GScanner *scanner, return G_TOKEN_NONE; } - -/* -typedef GdkPixmap * (*GtkImageLoader) (GdkWindow *window, - GdkColormap *colormap, - GdkBitmap **mask, - GdkColor *transparent_color, - const gchar *filename); -*/ - -void -gtk_rc_set_image_loader(GtkImageLoader loader) -{ - image_loader = loader; -} - -GdkPixmap * -gtk_rc_load_image (GdkColormap *colormap, - GdkColor *transparent_color, - const gchar *filename) -{ - if (strcmp (filename, "<parent>") == 0) - return (GdkPixmap*) GDK_PARENT_RELATIVE; - else - { - if(image_loader) - return image_loader(NULL, colormap, NULL, - transparent_color, - filename); - else - return gdk_pixmap_colormap_create_from_xpm (NULL, colormap, NULL, - transparent_color, - filename); - } -} |