GtkToolPalette: Change gtk_tool_palette_get_drop_group() return.

[~andy/gtk] / gtk / gtktext.c

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index c98a4840471019436475b8927d1c8a22367a1fbd..24f3b77e5a82a6fdb695284551c501e75614ab42 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -471,7 +471,7 @@ gtk_text_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      static const GInterfaceInfo editable_info =
+      const GInterfaceInfo editable_info =
       {
        (GInterfaceInitFunc) gtk_text_editable_init, /* interface_init */
        NULL, /* interface_finalize */
@@ -812,13 +812,13 @@ gtk_text_set_adjustments (GtkText       *text,
       g_object_ref_sink (text->hadj);
       
       gtk_signal_connect (GTK_OBJECT (text->hadj), "changed",
-                         (GtkSignalFunc) gtk_text_adjustment,
+                         G_CALLBACK (gtk_text_adjustment),
                          text);
       gtk_signal_connect (GTK_OBJECT (text->hadj), "value-changed",
-                         (GtkSignalFunc) gtk_text_adjustment,
+                         G_CALLBACK (gtk_text_adjustment),
                          text);
       gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy",
-                         (GtkSignalFunc) gtk_text_adjustment_destroyed,
+                         G_CALLBACK (gtk_text_adjustment_destroyed),
                          text);
       gtk_text_adjustment (hadj, text);
 
@@ -831,13 +831,13 @@ gtk_text_set_adjustments (GtkText       *text,
       g_object_ref_sink (text->vadj);
       
       gtk_signal_connect (GTK_OBJECT (text->vadj), "changed",
-                         (GtkSignalFunc) gtk_text_adjustment,
+                         G_CALLBACK (gtk_text_adjustment),
                          text);
       gtk_signal_connect (GTK_OBJECT (text->vadj), "value-changed",
-                         (GtkSignalFunc) gtk_text_adjustment,
+                         G_CALLBACK (gtk_text_adjustment),
                          text);
       gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy",
-                         (GtkSignalFunc) gtk_text_adjustment_destroyed,
+                         G_CALLBACK (gtk_text_adjustment_destroyed),
                          text);
       gtk_text_adjustment (vadj, text);
 
@@ -1158,7 +1158,7 @@ gtk_text_get_chars (GtkOldEditable *old_editable,
       guchar ch;
       ch = text->text.ch[end_pos];
       text->text.ch[end_pos] = 0;
-      retval = g_strdup (text->text.ch + start_pos);
+      retval = g_strdup ((gchar *)(text->text.ch + start_pos));
       text->text.ch[end_pos] = ch;
     }
 
@@ -4837,14 +4837,14 @@ draw_line (GtkText* text,
                                                 buffer.wc, len);
              else
              pixel_width = gdk_text_width (gc_values.font,
-                                             buffer.ch, len);
+                                           (gchar *)buffer.ch, len);
            }
          else
            {
              if (text->use_wchar)
                pixel_width = gdk_text_width_wc (font, buffer.wc, len);
              else
-               pixel_width = gdk_text_width (font, buffer.ch, len);
+               pixel_width = gdk_text_width (font, (gchar *)buffer.ch, len);
            }
          
          draw_bg_rect (text, &mark, running_offset, pixel_start_height,
@@ -4876,7 +4876,7 @@ draw_line (GtkText* text,
                           fg_gc,
                           running_offset,
                           pixel_height,
-                          buffer.ch,
+                          (gchar *)buffer.ch,
                           len);
          
          running_offset += pixel_width;