forked from AuroraMiddleware/gtk
fbfc305174
Tue Jun 26 19:39:03 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_set_style): Allow %NULL
for style to mean "revert to default style"
* gtk/gtkwidget.[ch] (gtk_widget_set_rc_style,
gtk_widget_restore_default_style): Make this functions
deprecated aliases for gtk_widget_set_style (widget, NULL).
* gtk/gtkwidget.[ch]: Remove:
gtk_widget_set_default_style ()
gtk_widget_push_style ()
gtk_widget_pop_style ()
These functions interact are overriden by RC files, and
thus virtually useless, and complicated.
Fri Jun 22 18:49:48 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrc.c: Add a GtkRcContext structure to hold
most of the previous global variables in gtkrc.c. This is
in preparation for multi-head, since each screen can
have different GtkSettings and RC information.
* gtk/gtkrc.[ch]:
* gtk/gtkrc.h (struct _GtkRcStyleClass): Add a
GtkSettings parameter to GtkRcStyle::parse.
* gdk/x11/gdkevents-x11.c gtk/gtksettings.c gtk/gtkrc.c:
Add two new settings gtk-theme-name, gtk-key-theme-name,
for RC files that are loaded by name after reading
the default RC files.
* gtk/gtkrc.c: Allow priorities for styles, as wll as
bindings.
* gtk/gtkenums.h gtk/gtkrc.c: Add GTK_PATH_PRIO_THEME,
and use it by default for RC files loaded via
gtk-theme-name, gtk-key-theme-name.
* gtk/gtkiconfactory.c (gtk_icon_source_set_filename)
gtk/gtkrc.c (gtk_rc_parse_pixmap_path_string)
tests/testgtkrc: Require pathnames to be absolute.
* gtk/gtkrc.c gtk/gtkiconfactory.c: Look up the full filename for
the source when parsing, since the operation of looking up a
pixmap from an RC file depends on the parsing context.
* gtk/gtkrc.c (gtk_rc_context_reparse_all): Automatically
reset RC styles on all widgets when files are reparsed.
* tests/testgtk.c (create_rc_file)
gtk/gtkwindow.c (gtk_window_read_rcfiles):
Simplify, now that gtk_rc_reparse_all() resets styles on
all widgets itself.
* gtk/gtkmain.c (gtk_get_default_language): Fix broken
return value.
* gtk/gtksettings.[ch] (gtk_settings_install_property[_ch]): Remove
GtkSettings argument.
* gtk/gtksettings.[ch] (gtk_settings_get_default): Rename from
gtk_settings_get_global().
* gtk/gtkwidget.[ch]: Add a function gtk_widget_Get_settings()
to get the appropriate GtkSettings for a widget. (For now,
just gets the default GtkSetttings.)
* gtk/gtkcolorsel.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtkmenubar.c
gtk/gtktextview.c gtk/gtktoolbar.c: Fixes for GtkSettings
changes.
* gtk/gtkrc.[ch]: Add gtk_rc_get_style_by_paths() to allow
getting a style for a path without actually having a widget.
(Allows using a style for a subpart of a widget, for
example.)
* gtk/gtkrc.[ch]: Add gtk_rc_reparse_all_for_setting() to allow forcing
the RC files to be reloaded for just one GtkSettings
(not sure how useful this really is.)
* gtk/gtkrc.h: Deprecate
gtk_rc_add_widget_name/widget_class/class_style
127 lines
4.3 KiB
C
127 lines
4.3 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 2000 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free
|
|
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
#ifndef __GTK_SETTINGS_H__
|
|
#define __GTK_SETTINGS_H__
|
|
|
|
#include <gtk/gtkrc.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
/* -- type macros --- */
|
|
#define GTK_TYPE_SETTINGS (gtk_settings_get_type ())
|
|
#define GTK_SETTINGS(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings))
|
|
#define GTK_SETTINGS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS, GtkSettingsClass))
|
|
#define GTK_IS_SETTINGS(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SETTINGS))
|
|
#define GTK_IS_SETTINGS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS))
|
|
#define GTK_SETTINGS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SETTINGS, GtkSettingsClass))
|
|
|
|
|
|
/* --- typedefs --- */
|
|
typedef struct _GtkSettingsClass GtkSettingsClass;
|
|
typedef struct _GtkSettingsValue GtkSettingsValue;
|
|
|
|
|
|
/* --- structures --- */
|
|
struct _GtkSettings
|
|
{
|
|
GObject parent_instance;
|
|
|
|
GData *queued_settings; /* of type GtkSettingsValue* */
|
|
GValue *property_values;
|
|
|
|
GtkRcContext *rc_context;
|
|
};
|
|
struct _GtkSettingsClass
|
|
{
|
|
GObjectClass parent_class;
|
|
|
|
};
|
|
struct _GtkSettingsValue
|
|
{
|
|
/* origin should be something like "filename:linenumber" for rc files,
|
|
* or e.g. "XProperty" for other sources
|
|
*/
|
|
gchar *origin;
|
|
|
|
/* valid types are LONG, DOUBLE and STRING corresponding to the token parsed,
|
|
* or a GSTRING holding an unparsed statement
|
|
*/
|
|
GValue value;
|
|
};
|
|
|
|
|
|
/* --- functions --- */
|
|
GType gtk_settings_get_type (void);
|
|
GtkSettings* gtk_settings_get_default (void);
|
|
void gtk_settings_install_property (GParamSpec *pspec);
|
|
void gtk_settings_install_property_parser (GParamSpec *pspec,
|
|
GtkRcPropertyParser parser);
|
|
|
|
/* --- precoded parsing functions --- */
|
|
gboolean gtk_rc_property_parse_color (const GParamSpec *pspec,
|
|
const GString *gstring,
|
|
GValue *property_value);
|
|
gboolean gtk_rc_property_parse_enum (const GParamSpec *pspec,
|
|
const GString *gstring,
|
|
GValue *property_value);
|
|
gboolean gtk_rc_property_parse_flags (const GParamSpec *pspec,
|
|
const GString *gstring,
|
|
GValue *property_value);
|
|
gboolean gtk_rc_property_parse_requisition (const GParamSpec *pspec,
|
|
const GString *gstring,
|
|
GValue *property_value);
|
|
gboolean gtk_rc_property_parse_border (const GParamSpec *pspec,
|
|
const GString *gstring,
|
|
GValue *property_value);
|
|
|
|
/*< private >*/
|
|
void gtk_settings_set_property_value (GtkSettings *settings,
|
|
const gchar *name,
|
|
const GtkSettingsValue *svalue);
|
|
void gtk_settings_set_string_property (GtkSettings *settings,
|
|
const gchar *name,
|
|
const gchar *v_string,
|
|
const gchar *origin);
|
|
void gtk_settings_set_long_property (GtkSettings *settings,
|
|
const gchar *name,
|
|
glong v_long,
|
|
const gchar *origin);
|
|
void gtk_settings_set_double_property (GtkSettings *settings,
|
|
const gchar *name,
|
|
gdouble v_double,
|
|
const gchar *origin);
|
|
|
|
|
|
/* implementation details */
|
|
void _gtk_settings_handle_event (GdkEventSetting *event);
|
|
GtkRcPropertyParser _gtk_rc_property_parser_from_type (GType type);
|
|
gboolean _gtk_settings_parse_convert (GtkRcPropertyParser parser,
|
|
const GValue *src_value,
|
|
GParamSpec *pspec,
|
|
GValue *dest_value);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* __GTK_SETTINGS_H__ */
|