Fix incorrect parameter to compute_double_length (#58680, patch from

Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix
        incorrect parameter to compute_double_length
        (#58680, patch from Matthias Clasen)

        Fixes for compilation with Forte cc. (#59734, Derek Rafter)

        * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.

        * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
        for GDK_RELEASE_MASK to avoid warnings with Forte.

        * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
        break; statements.

diff --git a/ChangeLog b/ChangeLog
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c2e8297ba1b22c5dc075b60aee258dd496b913d5..b0c9738c7566acb1af0166f4e053d2c46458db29 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+Tue Sep 18 20:47:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Fix 
+       incorrect parameter to compute_double_length
+       (#58680, patch from Matthias Clasen)
+
+       Fixes for compilation with Forte cc. (#59734, Derek Rafter)
+
+       * gtk/gtkwindow.h gtk/gtksizegroup.h: Remove extra ;.
+
+       * gdk/gdktypes.h (GdkModifierType): Write 1u << 31
+       for GDK_RELEASE_MASK to avoid warnings with Forte.
+
+       * gtk/gtktexttag.c gtk/gtkcellrendertext.c: Add some missing
+       break; statements.
+
 2001-09-18  Alex Larsson  <alexl@redhat.com>
 
         * gtk/gtkcheckbutton.c:

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 53e0ca3e91f127684b0ae0ca83e58951d2df37a5..caea6fd49c59edaca87eaaa537433d7cc036f65a 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -125,7 +125,7 @@ typedef enum
   GDK_BUTTON5_MASK  = 1 << 12,
   /* The next few modifiers are used by XKB, so we skip to the end
    */
-  GDK_RELEASE_MASK  = 1 << 31,
+  GDK_RELEASE_MASK  = 1u << 31,
   GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
 } GdkModifierType;
 

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 5a99a5a76ae9b5f50dd909156480e0d5900a5ec6..0055dff58b1a0cd888781d68f2fdfcfdda8bced4 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -552,6 +552,8 @@ gtk_cell_renderer_text_get_property (GObject        *object,
       {
        PangoFontMask mask = get_property_font_set_mask (param_id);
        g_value_set_boolean (value, (pango_font_description_get_set_fields (celltext->font) & mask) != 0);
+       
+       break;
       }
 
     case PROP_SCALE_SET:
@@ -875,6 +877,8 @@ gtk_cell_renderer_text_set_property (GObject      *object,
        notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (celltext->font));
        g_object_notify (object, "font_desc");
        g_object_notify (object, "font");
+
+       break;
       }
       
     case PROP_SCALE:

diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 0eb95ea48a2e22de59e3883ef8b1da4d1050c027..5dcb66a75a3c89a205b84890dd7881daf8a30e45 100644 (file)
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -74,7 +74,7 @@ typedef enum {
   GTK_SIZE_GROUP_BOTH
 } GtkSizeGroupMode;
 
-GType            gtk_size_group_get_type      (void) G_GNUC_CONST;;
+GType            gtk_size_group_get_type      (void) G_GNUC_CONST;
 
 GtkSizeGroup *   gtk_size_group_new           (GtkSizeGroupMode  mode);
 void             gtk_size_group_set_mode      (GtkSizeGroup     *size_group,

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 7a7a2d07a95a146004d46870bf70a9d750ef87f6..df40ea5e5af1b110d8d4f1f296a4d982ddd0cc7d 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -588,7 +588,7 @@ gtk_spin_button_size_request (GtkWidget      *widget,
       w = MIN (string_len, 10) * digit_width;
       width = MAX (width, w);
       string_len = compute_double_length (spin_button->adjustment->lower,
-                                         spin_button->adjustment->step_increment);
+                                         spin_button->digits);
       w = MIN (string_len, 10) * digit_width;
       width = MAX (width, w);
       

diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 97057f8fb7335baade2994c54813b2fd82a3744b..658e2ab82990b7c0a581daae6b05114c21d62607 100644 (file)
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1008,6 +1008,8 @@ gtk_text_tag_set_property (GObject      *object,
        notify_set_changed (object, old_set_mask & pango_font_description_get_set_fields (text_tag->values->font));
        g_object_notify (object, "font_desc");
        g_object_notify (object, "font");
+
+       break;
       }
       
     case PROP_SCALE:
@@ -1483,6 +1485,8 @@ gtk_text_tag_get_property (GObject      *object,
        PangoFontMask set_mask = tag->values->font ? pango_font_description_get_set_fields (tag->values->font) : 0;
        PangoFontMask test_mask = get_property_font_set_mask (prop_id);
        g_value_set_boolean (value, (set_mask & test_mask) != 0);
+
+       break;
       }
 
     case PROP_SCALE_SET:

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index c34b29797974cc386f21a49f964a0b67d6465341..4135997f596f3adc8e9363100ce8b91ca505ebef 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -292,7 +292,7 @@ void     gtk_window_reshow_with_initial_size (GtkWindow *window);
 
 /* Window groups
  */
-GType            gtk_window_group_get_type      (void) G_GNUC_CONST;;
+GType            gtk_window_group_get_type      (void) G_GNUC_CONST;
 
 GtkWindowGroup * gtk_window_group_new           (void);
 void             gtk_window_group_add_window    (GtkWindowGroup     *window_group,