mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-23 20:30:15 +00:00
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]
This commit is contained in:
parent
49a0e79dd6
commit
43b44fff94
@ -1,3 +1,11 @@
|
||||
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]
|
||||
|
||||
2004-01-16 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a
|
||||
|
@ -1,3 +1,11 @@
|
||||
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]
|
||||
|
||||
2004-01-16 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a
|
||||
|
@ -1,3 +1,11 @@
|
||||
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]
|
||||
|
||||
2004-01-16 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a
|
||||
|
@ -1,3 +1,11 @@
|
||||
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]
|
||||
|
||||
2004-01-16 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a
|
||||
|
@ -1,3 +1,11 @@
|
||||
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]
|
||||
|
||||
2004-01-16 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a
|
||||
|
@ -3602,7 +3602,7 @@ gtk_toolbar_finalize (GObject *object)
|
||||
GList *list;
|
||||
GtkToolbar *toolbar = GTK_TOOLBAR (object);
|
||||
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
|
||||
|
||||
|
||||
if (toolbar->tooltips)
|
||||
g_object_unref (toolbar->tooltips);
|
||||
|
||||
@ -3618,6 +3618,9 @@ gtk_toolbar_finalize (GObject *object)
|
||||
|
||||
g_timer_destroy (priv->timer);
|
||||
|
||||
if (priv->menu)
|
||||
gtk_widget_destroy (priv->menu);
|
||||
|
||||
if (priv->idle_id)
|
||||
g_source_remove (priv->idle_id);
|
||||
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user