summaryrefslogtreecommitdiff
path: root/gtk/gtkfontsel.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-05-25 20:41:46 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-05-25 20:41:46 +0000
commit87684f9549a8ea4e2fa7b4c6ab69ded73b34b991 (patch)
tree6d8f80c793761bd48f38aadbf6dae7c7f45b75fb /gtk/gtkfontsel.c
parentb5db5d514d7ffd829c6e97a4630cf95d7b8fef3d (diff)
downloadgdk-pixbuf-87684f9549a8ea4e2fa7b4c6ab69ded73b34b991.tar.gz
get sizes an icon set can render without falling back to missing image
2001-05-25 Havoc Pennington <hp@redhat.com> * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon set can render without falling back to missing image icon * gtk/gtktextview.c (gtk_text_view_size_request): request full size of text, instead of random values * gtk/gtktreeview.c (gtk_tree_view_size_request): request full size of tree view, instead of random values * gtk/gtkiconfactory.c (gtk_icon_set_render_icon): render fallback image in an appropriate size * gtk/gtkstock.h: Rename the stock items including _BUTTON_, etc. not to include that. i.e. s/GTK_STOCK_BUTTON_OK/GTK_STOCK_OK/ Throughout: fix GTK_STOCK_BUTTON_ instances * gtk/gtkstock.h, gtk/gtkstock.c, gtk/gtkiconfactory.h, gtk/gtkiconfactory.c, gtk/stock-icons/Makefile.am: Add a bunch of new stock items/icons * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): new function, convenience for inserting columns with a data func * gtk/gtkiconfactory.c: keep a list of all existing icon factories (_gtk_icon_factory_list_ids): use list of all factories to generate a list of all known IDs * gtk/gtkstock.c (gtk_stock_list_ids): replace gtk_stock_list_items() with a function that returns all IDs known including those for GtkIconFactory.
Diffstat (limited to 'gtk/gtkfontsel.c')
-rw-r--r--gtk/gtkfontsel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index c3e169df9..00ea3e990 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -987,18 +987,18 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
fontseldiag->action_area = dialog->action_area;
fontseldiag->ok_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_BUTTON_OK,
+ GTK_STOCK_OK,
GTK_RESPONSE_OK);
gtk_widget_grab_default (fontseldiag->ok_button);
fontseldiag->apply_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_BUTTON_APPLY,
+ GTK_STOCK_APPLY,
GTK_RESPONSE_APPLY);
gtk_widget_hide (fontseldiag->apply_button);
fontseldiag->cancel_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_BUTTON_CANCEL,
+ GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
gtk_window_set_title (GTK_WINDOW (fontseldiag),