From 6eb649146c2f03547efadc4eca9ddc30412de439 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 23 Jul 1999 00:36:33 +0000 Subject: [PATCH] asure that the requested width and height are always >0 (owen). Fri Jul 23 01:00:15 1999 Tim Janik * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested width and height are always >0 (owen). --- 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/gtksocket.c | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9d04844a95..bc4ccb324a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 23 01:00:15 1999 Tim Janik + + * gtk/gtksocket.c (gtk_socket_size_request): asure that the requested + width and height are always >0 (owen). + Fri Jul 23 00:00:47 1999 Tim Janik * gtk/gtkwidget.c (gtk_widget_size_allocate): backed out my recent diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 7a98f48ba5..673a8cb392 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -305,8 +305,8 @@ gtk_socket_size_request (GtkWidget *widget, gdk_error_trap_pop (); } - requisition->width = socket->request_width; - requisition->height = socket->request_height; + requisition->width = MAX (socket->request_width, 1); + requisition->height = MAX (socket->request_height, 1); } static void