Clamp size of child to at least 1x1. (#82431, Boris Shingarov.)

Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate):
        Clamp size of child to at least 1x1. (#82431,
        Boris Shingarov.)

diff --git a/ChangeLog b/ChangeLog
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7e0855c453ac1e70c76e44f5706ac5d27cb95e4d..d639ea54105bb7c9c066d93de91a16748a74a379 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jun 12 16:21:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckbutton.c (gtk_check_button_size_allocate): 
+       Clamp size of child to at least 1x1. (#82431, 
+       Boris Shingarov.)
+
 Wed Jun 12 15:43:38 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 6d911530768ce53ba5271afd4c274f34c383676c..5e3ef30d5139be1edb5b949a7a9cfb97269afdf9 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -301,9 +301,12 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
                                        allocation->width -
                                        ((border_width + focus_width + focus_pad) * 2
                                         + indicator_size + indicator_spacing * 3));
+         child_allocation.width = MAX (child_allocation.width, 1);
 
          child_allocation.height = MIN (child_requisition.height,
                                         allocation->height - (border_width + focus_width + focus_pad) * 2);
+         child_allocation.height = MAX (child_allocation.height, 1);
+         
          child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 +
                                widget->allocation.x + focus_width + focus_pad);
          child_allocation.y = widget->allocation.y +