diff options
| author | Havoc Pennington <hp@pobox.com> | 2001-02-13 05:44:47 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-02-13 05:44:47 +0000 |
| commit | 2097d764a7a60f87a0ca4c43720f3e2644652a14 (patch) | |
| tree | 5ce16eb25b20f4f6993b003c8e35e4eaf2f9b3c8 /demos | |
| parent | 41b2d039af6f972a5c442d860277164f90fb9ccb (diff) | |
| download | gtk+-2097d764a7a60f87a0ca4c43720f3e2644652a14.tar.gz | |
fix bug where it always set the foreground, even if we were only using a
2001-02-12 Havoc Pennington <hp@pobox.com>
* gdk/gdkpango.c (gdk_pango_get_gc): fix bug where
it always set the foreground, even if we were only using
a stipple.
(gdk_draw_layout_line_with_colors): new function, allow
override colors
(gdk_draw_layout_with_colors): new function, allow override
colors
(gdk_pango_layout_line_get_clip_region): function to get the clip
region for a logical text range
(gdk_pango_layout_get_clip_region): get the clip region for a
logical text range
* gdk/x11/gdkcolor-x11.c: forward declare gdk_colormap_sync(),
(gdk_colormap_new): fix call to gdk_colormap_sync() so it has
the right number of arguments.
* gtk/gtktextbtree.c (gtk_text_btree_node_check_consistency):
enhance the function to check that node data corresponds to a
view still belonging to the tree.
* gtk/gtktreeview.c (gtk_tree_view_changed): we were leaking the
GtkTreePath
(gtk_tree_view_inserted): ditto
(gtk_tree_view_child_toggled): ditto
* gtk/gtktreemodel.c (gtk_tree_path_append_index): use realloc to
simplify this code.
* gtk/gtkcellrenderertext.c (get_layout): fix leak of
a PangoAttrList
* demos/gtk-demo/main.c (load_file): Fix leak of a GString
* gtk/gtkentry.c (gtk_entry_realize): Fix leak of a GdkCursor
* gtk/gtkmenubar.c (gtk_menu_bar_size_request): consider toggle
size in the size request
(gtk_menu_bar_size_allocate): consider toggle size here
* gtk/gtkimagemenuitem.h, gtkimagemenuitem.c: Menu item
that displays a widget in the toggle slot
* gtk/testgtk.c: test GtkImageMenuItem
* gtk/Makefile.am, gtk/gtk.h: Add GtkImageMenuItem
* gtk/gtkmenuitem.h: Use "gint" not "guint16" for toggle size
request and allocation
* gtk/gtkmenu.c (gtk_menu_size_request): use gint not guint16
* gtk/gtkcheckmenuitem.c
(gtk_check_menu_item_toggle_size_request): ditto
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index e03ad041a0..4212ca6507 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -103,7 +103,10 @@ load_file (const gchar *filename) gboolean in_para = 0; if (current_file && !strcmp (current_file, filename)) - return; + { + g_string_free (buffer, TRUE); + return; + } g_free (current_file); current_file = g_strdup (filename); @@ -229,6 +232,8 @@ load_file (const gchar *filename) gtk_text_buffer_get_bounds (source_buffer, &start, &end); gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end); + + g_string_free (buffer, TRUE); } gboolean |