From a959d3daf8824b0d1ebca5fcbfc4d97e86163fc6 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 22 Oct 2001 21:28:08 +0000 Subject: [PATCH] fix #62365 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix #62365 --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktextview.c | 16 +++++++++------- 8 files changed, 44 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index db5429d62d..f7b28ac0cd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-10-22 Havoc Pennington + + * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix + #62365 + 2001-10-22 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_get_window_type): fix diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 94869650a9..3296fc30f6 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -6285,25 +6285,27 @@ gtk_text_view_get_border_window_size (GtkTextView *text_view, GtkTextWindowType type) { g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0); - g_return_val_if_fail (type != GTK_TEXT_WINDOW_WIDGET, 0); - g_return_val_if_fail (type != GTK_TEXT_WINDOW_TEXT, 0); switch (type) { case GTK_TEXT_WINDOW_LEFT: - return text_view->left_window->requisition.width; + if (text_view->left_window) + return text_view->left_window->requisition.width; case GTK_TEXT_WINDOW_RIGHT: - return text_view->right_window->requisition.width; + if (text_view->right_window) + return text_view->right_window->requisition.width; case GTK_TEXT_WINDOW_TOP: - return text_view->top_window->requisition.height; + if (text_view->top_window) + return text_view->top_window->requisition.height; case GTK_TEXT_WINDOW_BOTTOM: - return text_view->bottom_window->requisition.height; + if (text_view->bottom_window) + return text_view->bottom_window->requisition.height; default: - g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size in %s\n", G_STRLOC); + g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size()"); break; }