add demo of passing non-stock label in to gtk_dialog_new_with_buttons

2001-09-26  Havoc Pennington  <hp@redhat.com>

	* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
	of passing non-stock label in to gtk_dialog_new_with_buttons

	* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
	debugging updates

	* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
	are private

	* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
	exist, fall back to mnemonic label, not plain label, bug #61184
This commit is contained in:
Havoc Pennington 2001-09-27 00:11:23 +00:00 committed by Havoc Pennington
parent 4b6bc02f66
commit 1773d81558
11 changed files with 118 additions and 3 deletions

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -1,3 +1,17 @@
2001-09-26 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/dialog.c (interactive_dialog_clicked): add demo
of passing non-stock label in to gtk_dialog_new_with_buttons
* gtk/gtktextview.c (cursor_blinks): disable cursor blink when
debugging updates
* gtk/gtktextiter.h: comment about how GtkTextIter struct contents
are private
* gtk/gtkbutton.c (gtk_button_new_from_stock): if stock ID doesn't
exist, fall back to mnemonic label, not plain label, bug #61184
Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com> Wed Sep 26 19:48:01 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being * gtk/gtktreestore.c (gtk_tree_store_set_valist): Stop being

View File

@ -46,6 +46,8 @@ interactive_dialog_clicked (GtkButton *button,
GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_STOCK_OK,
GTK_RESPONSE_OK, GTK_RESPONSE_OK,
"_Non-stock Button",
GTK_RESPONSE_CANCEL,
NULL); NULL);
hbox = gtk_hbox_new (FALSE, 8); hbox = gtk_hbox_new (FALSE, 8);

View File

@ -465,16 +465,24 @@ gtk_button_new_with_label (const gchar *label)
/** /**
* gtk_button_new_from_stock: * gtk_button_new_from_stock:
* @stock_id: the name of the stock item * @stock_id: the name of the stock item
* @returns: a new #GtkButton
* *
* Creates a new #GtkButton containing the image and text from a stock item. * Creates a new #GtkButton containing the image and text from a stock item.
* Some stock ids have preprocessor macros like #GTK_STOCK_OK and * Some stock ids have preprocessor macros like #GTK_STOCK_OK and
* #GTK_STOCK_APPLY. * #GTK_STOCK_APPLY.
*
* If @stock_id is unknown, then it will be treated as a mnemonic
* label (as for gtk_button_new_with_mnemonic()).
*
* Returns: a new #GtkButton
**/ **/
GtkWidget* GtkWidget*
gtk_button_new_from_stock (const gchar *stock_id) gtk_button_new_from_stock (const gchar *stock_id)
{ {
return g_object_new (GTK_TYPE_BUTTON, "label", stock_id, "use_stock", TRUE, NULL); return g_object_new (GTK_TYPE_BUTTON,
"label", stock_id,
"use_stock", TRUE,
"use_underline", TRUE,
NULL);
} }
/** /**

View File

@ -43,6 +43,11 @@ extern "C" {
typedef struct _GtkTextBuffer GtkTextBuffer; typedef struct _GtkTextBuffer GtkTextBuffer;
struct _GtkTextIter { struct _GtkTextIter {
/* GtkTextIter is an opaque datatype; ignore all these fields.
* Initialize the iter with gtk_text_buffer_get_iter_*
* functions
*/
/*< private >*/
gpointer dummy1; gpointer dummy1;
gpointer dummy2; gpointer dummy2;
gint dummy3; gint dummy3;

View File

@ -3776,6 +3776,8 @@ cursor_blinks (GtkTextView *text_view)
#ifdef DEBUG_VALIDATION_AND_SCROLLING #ifdef DEBUG_VALIDATION_AND_SCROLLING
return FALSE; return FALSE;
#endif #endif
if (gtk_debug_flags & GTK_DEBUG_UPDATES)
return FALSE;
g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL); g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL);
return blink; return blink;