diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-05-25 20:41:46 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-05-25 20:41:46 +0000 |
| commit | 87684f9549a8ea4e2fa7b4c6ab69ded73b34b991 (patch) | |
| tree | 6d8f80c793761bd48f38aadbf6dae7c7f45b75fb /demos | |
| parent | b5db5d514d7ffd829c6e97a4630cf95d7b8fef3d (diff) | |
| download | gdk-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 'demos')
| -rw-r--r-- | demos/gtk-demo/Makefile.am | 1 | ||||
| -rw-r--r-- | demos/gtk-demo/button_box.c | 4 | ||||
| -rw-r--r-- | demos/gtk-demo/dialog.c | 2 | ||||
| -rw-r--r-- | demos/gtk-demo/sizegroup.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 228296aec..a25c647dd 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -15,6 +15,7 @@ demos = @STRIP_BEGIN@ \ panes.c \ pixbufs.c \ sizegroup.c \ + stock_browser.c \ textview.c \ @STRIP_END@ diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c index 286610ea3..f4527a833 100644 --- a/demos/gtk-demo/button_box.c +++ b/demos/gtk-demo/button_box.c @@ -28,10 +28,10 @@ create_bbox (gint horizontal, gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout); gtk_box_set_spacing (GTK_BOX (bbox), spacing); - button = gtk_button_new_from_stock (GTK_STOCK_BUTTON_OK); + button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_container_add (GTK_CONTAINER (bbox), button); - button = gtk_button_new_from_stock (GTK_STOCK_BUTTON_CANCEL); + button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); gtk_container_add (GTK_CONTAINER (bbox), button); button = gtk_button_new_from_stock (GTK_STOCK_HELP); diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c index 0e9952016..92358b973 100644 --- a/demos/gtk-demo/dialog.c +++ b/demos/gtk-demo/dialog.c @@ -44,7 +44,7 @@ interactive_dialog_clicked (GtkButton *button, dialog = gtk_dialog_new_with_buttons ("Interactive Dialog", GTK_WINDOW (window), GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_BUTTON_OK, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c index 362ffcbc0..2bd3022e2 100644 --- a/demos/gtk-demo/sizegroup.c +++ b/demos/gtk-demo/sizegroup.c @@ -110,7 +110,7 @@ do_sizegroup (void) { window = gtk_dialog_new_with_buttons ("GtkSizeGroup", NULL, 0, - GTK_STOCK_BUTTON_CLOSE, + GTK_STOCK_CLOSE, GTK_RESPONSE_NONE, NULL); gtk_window_set_resizeable (GTK_WINDOW (window), FALSE); |