diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-02-16 04:52:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-02-16 04:52:21 +0000 |
| commit | bf39d4cda92b993104e9d6447a32c94c75427f11 (patch) | |
| tree | 908c22a4208286c8491b144b311c7ba6c3248fa2 /tests | |
| parent | fd2c0c5651ced62c6c235629ee0dcc9cb5d154f2 (diff) | |
| download | gtk+-bf39d4cda92b993104e9d6447a32c94c75427f11.tar.gz | |
Use a ScrolledWindow test how Text widgets work within ScrolledWindow.
Mon Feb 15 23:55:27 1999 Owen Taylor <otaylor@redhat.com>
* gtk/testgtk.c (create_text): Use a ScrolledWindow
test how Text widgets work within ScrolledWindow.
(POLICY_AUTOMATIC drew very badly, so it uses
POLICY_ALWAYS for the vscrollbar)
* gtk/gtktext.c (gtk_text_unrealize): Free the cache
in the unrealize handler. Some code in gtktext.c
assumes that if text->line_start_cache is non-NULL,
the widget is realized. We'll recompute it again
anyways if we later re-realize.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testgtk.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index 980ac75c76..14e7942705 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -5528,9 +5528,7 @@ create_text (void) GtkWidget *button; GtkWidget *check; GtkWidget *separator; - GtkWidget *table; - GtkWidget *hscrollbar; - GtkWidget *vscrollbar; + GtkWidget *scrolled_window; GtkWidget *text; GdkFont *font; @@ -5562,29 +5560,19 @@ create_text (void) gtk_widget_show (box2); - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2); - gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2); - gtk_box_pack_start (GTK_BOX (box2), table, TRUE, TRUE, 0); - gtk_widget_show (table); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_box_pack_start (GTK_BOX (box2), scrolled_window, TRUE, TRUE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_NEVER, + GTK_POLICY_ALWAYS); + gtk_widget_show (scrolled_window); text = gtk_text_new (NULL, NULL); gtk_text_set_editable (GTK_TEXT (text), TRUE); - gtk_table_attach (GTK_TABLE (table), text, 0, 1, 0, 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + gtk_container_add (GTK_CONTAINER (scrolled_window), text); gtk_widget_grab_focus (text); gtk_widget_show (text); - hscrollbar = gtk_hscrollbar_new (GTK_TEXT (text)->hadj); - gtk_table_attach (GTK_TABLE (table), hscrollbar, 0, 1, 1, 2, - GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_FILL, 0, 0); - gtk_widget_show (hscrollbar); - - vscrollbar = gtk_vscrollbar_new (GTK_TEXT (text)->vadj); - gtk_table_attach (GTK_TABLE (table), vscrollbar, 1, 2, 0, 1, - GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (vscrollbar); gtk_text_freeze (GTK_TEXT (text)); |