diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2004-01-17 11:51:28 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-01-17 11:51:28 +0000 |
| commit | 43b44fff94938c0711512a23ef5e0f21f38a470b (patch) | |
| tree | 0930fcc16f1e26690080f3591d7ddf654c0c508b /gtk/gtktoolbar.h | |
| parent | 49a0e79dd61ffe505ab4ce3b629011f0861fedc5 (diff) | |
| download | gtk+-43b44fff94938c0711512a23ef5e0f21f38a470b.tar.gz | |
Don't leak the overflow menu.
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
Diffstat (limited to 'gtk/gtktoolbar.h')
| -rw-r--r-- | gtk/gtktoolbar.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 195b38657f..a7fa7bdc76 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -76,14 +76,14 @@ struct _GtkToolbarChild GtkWidget *label; }; +#endif /* GTK_DISABLE_DEPRECATED */ + typedef enum { GTK_TOOLBAR_SPACE_EMPTY, GTK_TOOLBAR_SPACE_LINE } GtkToolbarSpaceStyle; -#endif /* GTK_DISABLE_DEPRECATED */ - typedef struct _GtkToolbar GtkToolbar; typedef struct _GtkToolbarClass GtkToolbarClass; typedef struct _GtkToolbarPrivate GtkToolbarPrivate; @@ -92,7 +92,7 @@ struct _GtkToolbar { GtkContainer container; - /*< private >*/ + /*< public >*/ gint num_children; GList *children; GtkOrientation orientation; @@ -101,6 +101,7 @@ struct _GtkToolbar GtkTooltips *tooltips; + /*< private >*/ gint button_maxw; /* maximum width of homogeneous children */ gint button_maxh; /* maximum height of homogeneous children */ @@ -164,8 +165,13 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar, gint index); -/* internal function */ -gchar * _gtk_toolbar_elide_underscores (const gchar *original); +/* internal functions */ +gchar * _gtk_toolbar_elide_underscores (const gchar *original); +/* these two functions actually accept NULL for the toolbar, in which case + * you'll get a default value + */ +int _gtk_toolbar_get_space_size (GtkToolbar *toolbar); +GtkToolbarSpaceStyle _gtk_toolbar_get_space_style (GtkToolbar *toolbar); #ifndef GTK_DISABLE_DEPRECATED void gtk_toolbar_set_icon_size (GtkToolbar *toolbar, |