diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-04 23:15:51 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-04 23:15:51 +0000 |
| commit | 1b3c9214371d89a4872574d700b86cb71d6eee56 (patch) | |
| tree | cc6c602393a292313c61da2b246b5a6b4de2ff4d /gtk/gtktoolbar.h | |
| parent | 9cc992b6e732fef6edf2153821354a6b1b6a5af6 (diff) | |
| download | gtk+-1b3c9214371d89a4872574d700b86cb71d6eee56.tar.gz | |
Handle case where we need to parse the xsetting as if it were an RC file
2001-05-10 Havoc Pennington <hp@redhat.com>
* gtk/gtksettings.c (gtk_settings_get_property): Handle case where
we need to parse the xsetting as if it were an RC file string.
* gtk/gtkcolorsel.c (gtk_color_selection_class_init): load initial
value of palette from settings, not from static variable
* gdk/x11/gdkevents-x11.c: add color palette, toolbar mode to
xsettings translation table
* gtk/gtktoolbar.c (gtk_toolbar_new): Remove arguments, because
hardcoding the toolbar style conflicts with new customizable
toolbar style philosophy
(gtk_toolbar_class_init): add settings for default toolbar style;
these are used unless the app specifically forces a toolbar style
* gtk/gtksettings.c (settings_install_property_parser): only
return at the start if we warn and parser == NULL
* gtk/gtkcolorsel.c (gtk_color_selection_finalize): disconnect the
palette changed handler so we don't notify dead color selections
* gtk/gtkstyle.c (gtk_default_draw_shadow): handle
xthickness/ythickness of 0 or 1 properly
(gtk_default_draw_resize_grip): clear the background behind the
resize grips, and align to bottom right if we square the
area to be drawn.
* gtk/gtkstatusbar.c (gtk_statusbar_init): set horizontal usize on
statusbar label to 1, so it doesn't make toplevels resize oddly
(gtk_statusbar_size_request): add grip size to request
(gtk_statusbar_size_allocate): hack so the hbox still works with
the grip size in the request
* gtk/gtktoolbar.c (gtk_toolbar_show_all): override to fix
bug where showing all on a toplevel makes the toolbar
button text appear despite the toolbar mode
* gtk/gtkmenubar.c: add internal padding style property
* gtk/gtktoolbar.c: Add internal padding style property; add
shadow type style property
* gtk/gtkmenubar.c (gtk_menu_bar_paint): paint box with widget
state; and put Container::border_width outside the frame
* gtk/gtktextview.c: don't draw focus rectangle if we're in
interior focus mode, we just use blinking cursor
Diffstat (limited to 'gtk/gtktoolbar.h')
| -rw-r--r-- | gtk/gtktoolbar.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 19ed1b90c4..79d3d79dbc 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -91,6 +91,12 @@ struct _GtkToolbar gint button_maxw; gint button_maxh; + + guint style_set_connection; + guint icon_size_connection; + + guint style_set : 1; + guint icon_size_set : 1; }; struct _GtkToolbarClass @@ -105,8 +111,7 @@ struct _GtkToolbarClass GtkType gtk_toolbar_get_type (void) G_GNUC_CONST; -GtkWidget* gtk_toolbar_new (GtkOrientation orientation, - GtkToolbarStyle style); +GtkWidget* gtk_toolbar_new (void); /* Simple button items */ GtkWidget* gtk_toolbar_append_item (GtkToolbar *toolbar, @@ -133,8 +138,6 @@ GtkWidget* gtk_toolbar_insert_item (GtkToolbar *toolbar, gint position); /* Stock Items */ -void gtk_toolbar_set_icon_size (GtkToolbar *toolbar, - GtkIconSize icon_size); GtkWidget* gtk_toolbar_insert_stock (GtkToolbar *toolbar, const gchar *stock_id, const char *tooltip_text, @@ -203,8 +206,12 @@ void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation); void gtk_toolbar_set_style (GtkToolbar *toolbar, GtkToolbarStyle style); +void gtk_toolbar_set_icon_size (GtkToolbar *toolbar, + GtkIconSize icon_size); void gtk_toolbar_set_tooltips (GtkToolbar *toolbar, gboolean enable); +void gtk_toolbar_unset_style (GtkToolbar *toolbar); +void gtk_toolbar_unset_icon_size (GtkToolbar *toolbar); #ifdef __cplusplus } |