* PChar -> PAnsiChar

packages/gtk2/examples/gtk_demo/appwindow.inc

@@ -279,11 +279,11 @@ begin
                               TGDestroyNotify (@g_object_unref));
 
     (* create menu items *)
-    menu_items[2].extra_data:=PChar(GTK_STOCK_NEW);
-    menu_items[3].extra_data:=PChar(GTK_STOCK_OPEN);
-    menu_items[4].extra_data:=PChar(GTK_STOCK_SAVE);
-    menu_items[5].extra_data:=PChar(GTK_STOCK_SAVE_AS);
-    menu_items[7].extra_data:=PChar(GTK_STOCK_QUIT);
+    menu_items[2].extra_data:=PAnsiChar(GTK_STOCK_NEW);
+    menu_items[3].extra_data:=PAnsiChar(GTK_STOCK_OPEN);
+    menu_items[4].extra_data:=PAnsiChar(GTK_STOCK_SAVE);
+    menu_items[5].extra_data:=PAnsiChar(GTK_STOCK_SAVE_AS);
+    menu_items[7].extra_data:=PAnsiChar(GTK_STOCK_QUIT);
 
     gtk_item_factory_create_items (item_factory, high (menu_items),
                                    @menu_items[1], application_window );

packages/gtk2/examples/gtk_demo/gtk_demo.pas

@@ -20,7 +20,7 @@ var
 
 
 type
-  TFileOfChar = file of char;
+  TFileOfChar = file of AnsiChar;
 
   TGDoDemoFunc = function : PGtkWidget;
 
@@ -51,7 +51,7 @@ const
   STATE_NORMAL     = 0;
   STATE_IN_COMMENT = 1;
 
-  function demo_find_file (    base : pchar; err  : PPGError): pgchar; forward;
+  function demo_find_file (    base : PAnsiChar; err  : PPGError): pgchar; forward;
 
   (* file_is_valid
    *  a dirty little hack to find out if a file variable is assigned and the
@@ -154,10 +154,10 @@ const
       (title:  nil;                          filename: nil;                 func: nil;               children: nil));
 
 
-function demo_find_file (    base : pchar;
+function demo_find_file (    base : PAnsiChar;
                              err  : PPGError): pgchar;
 var
-  filename : pchar;
+  filename : PAnsiChar;
 
 begin
 
@@ -240,7 +240,7 @@ const
       ('integer',
        'gchar',
        'pgchar',
-       'char',
+       'AnsiChar',
        'gfloat',
        'real',
        'gint8',
@@ -567,7 +567,7 @@ function read_line (var f: TFileOfChar; str: PGString): boolean;
 var
   n_read : integer;
   c,
-  next_c : char;
+  next_c : AnsiChar;
 
 begin
   n_read := 0;
@@ -613,7 +613,7 @@ var
 
   in_para      : gboolean;
   f            : TFileOfChar;
-  full_name    : pchar;
+  full_name    : PAnsiChar;
   p, q, r      : pgchar;
 
 begin
@@ -966,7 +966,7 @@ end;
 procedure setup_default_icon;
 var
   pixbuf      : PGdkPixbuf;
-  filename    : pchar;
+  filename    : PAnsiChar;
   err         : PGError;
 
   dialog      : PGtkWidget;

packages/gtk2/examples/gtk_demo/pixbufs.inc

@@ -18,7 +18,7 @@ const
 
   BACKGROUND_NAME = 'background.jpg';
 
-  image_names : array [1..8] of pchar = (
+  image_names : array [1..8] of PAnsiChar = (
     'apple-red.png',
     'gnome-applets.png',
     'gnome-calendar.png',

packages/gtk2/examples/gtk_demo/sizegroup.inc

@@ -18,23 +18,23 @@ var
 
 
 const
-  color_options : array [0..3] of pchar = ('Red', 'Green', 'Blue', NULL);
+  color_options : array [0..3] of PAnsiChar = ('Red', 'Green', 'Blue', NULL);
 
-  dash_options  : array [0..3] of pchar = ('Solid', 'Dashed', 'Dotted', NULL);
+  dash_options  : array [0..3] of PAnsiChar = ('Solid', 'Dashed', 'Dotted', NULL);
 
-  end_options   : array [0..3] of pchar = ('Square', 'Round', 'Arrow', NULL);
+  end_options   : array [0..3] of PAnsiChar = ('Square', 'Round', 'Arrow', NULL);
 
 
 (* Convenience function to create an option menu holding a number of strings
  *)
 
-function create_option_menu (strings : ppchar): PGtkWidget;
+function create_option_menu (strings : PPAnsiChar): PGtkWidget;
 var
   menu,
   menu_item,
   option_menu : PGtkWidget;
 
-  str         : ppchar;
+  str         : PPAnsiChar;
 
 begin
   menu := gtk_menu_new ();
@@ -58,8 +58,8 @@ end;
 procedure add_row (table      : PGtkTable;
                    row        : integer;
                    size_group : PGtkSizeGroup;
-                   label_text : pchar;
-                   options    : ppchar);
+                   label_text : PAnsiChar;
+                   options    : PPAnsiChar);
 var
   option_menu : PGtkWidget;
   thelabel    : PGtkWidget;

packages/gtk2/examples/gtk_demo/textview.inc

@@ -20,7 +20,7 @@ const
   gray50_width  = 2;
   gray50_height = 2;
 
-  gray50_bits: array [0..1] of char = (#2, #1);
+  gray50_bits: array [0..1] of AnsiChar = (#2, #1);
 
 procedure create_tags (buffer : PGtkTextBuffer);
 var
@@ -154,7 +154,7 @@ var
   text_end     : TGtkTextIter;
   pixbuf,
   scaled       : PGdkPixbuf;
-  filename     : pchar;
+  filename     : PAnsiChar;
 
 begin
   (* demo_find_file() looks in the the current directory first,
@@ -333,7 +333,7 @@ begin
             + 'blah blah blah blah blah blah blah blah blah'#13#10#13#10, -1,
                                             'char_wrap', [NULL]);
 
-  gtk_text_buffer_insert_with_tags_by_name (buffer, @iter, PChar(
+  gtk_text_buffer_insert_with_tags_by_name (buffer, @iter, PAnsiChar(
               'This line has all wrapping turned off, so it makes the horizontal '
             + 'scrollbar appear.'#13#10#13#10#13#10), -1,
                                             'no_wrap', [NULL]);

packages/gtk2/examples/helloworld2/helloworld2.pas

@@ -66,7 +66,7 @@ begin
     (* Now when the button is clicked, we call the "callback" function
      * with a pointer to "button 1" as its argument *)
     g_signal_connect (G_OBJECT (button), 'clicked',
-                              G_CALLBACK (@callback), PChar('button 1'));
+                              G_CALLBACK (@callback), PAnsiChar('button 1'));
 
     (* Instead of gtk_container_add, we pack this button into the invisible
      * box, which has been packed into the window. *)
@@ -82,7 +82,7 @@ begin
     (* Call the same callback function with a different argument,
      * passing a pointer to "button 2" instead. *)
     g_signal_connect (G_OBJECT (button), 'clicked',
-                              G_CALLBACK (@callback), PChar('button 2'));
+                              G_CALLBACK (@callback), PAnsiChar('button 2'));
 
     gtk_box_pack_start(GTK_BOX (box1), button, TRUE, TRUE, 0);
 

packages/gtk2/examples/plugins/plugin.pas

@@ -1,6 +1,6 @@
 library some_plugin;
 
-function get_plugin_info: pchar; export; cdecl;
+function get_plugin_info: PAnsiChar; export; cdecl;
 begin
   get_plugin_info:= 'GLib2 Plugin-Test Plugin';
 end;

packages/gtk2/src/atk/atktext.inc

@@ -57,7 +57,7 @@
   @ATK_TEXT_ATTR_FG_COLOR:The foreground color. The value is an RGB value of the format "%u,%u,%u"
   @ATK_TEXT_ATTR_BG_STIPPLE: "true" if a #GdkBitmap is set for stippling the background color.
   @ATK_TEXT_ATTR_FG_STIPPLE: "true" if a #GdkBitmap is set for stippling the foreground color.
-  @ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "char" or "word"
+  @ATK_TEXT_ATTR_WRAP_MODE: The wrap mode of the text, if any. Values are "none", "AnsiChar" or "word"
   @ATK_TEXT_ATTR_DIRECTION: The direction of the text, if set. Values are "none", "ltr" or "rtl"
   @ATK_TEXT_ATTR_JUSTIFICATION: The justification of the text, if set. Values are "left", "right", "center" or "fill"
   @ATK_TEXT_ATTR_STRETCH: The stretch of the text, if set. Values are "ultra_condensed", "extra_condensed", "condensed", "semi_condensed", "normal", "semi_expanded", "expanded", "extra_expanded" or "ultra_expanded"

packages/gtk2/src/glib/gconvert.inc

@@ -45,6 +45,6 @@ function g_locale_from_utf8(utf8string:Pgchar; len:gssize; bytes_read:Pgsize; by
 { Convert between the operating system (or C runtime) representation of file names and UTF-8. }
 function g_filename_to_utf8(opsysstring:Pgchar; len:gssize; bytes_read:Pgsize; bytes_written:Pgsize; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_to_utf8';
 function g_filename_from_utf8(utf8string:Pgchar; len:gssize; bytes_read:Pgsize; bytes_written:Pgsize; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_from_utf8';
-function g_filename_from_uri(uri:Pchar; hostname:PPchar; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_from_uri';
-function g_filename_to_uri(filename:Pchar; hostname:Pchar; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_to_uri';
+function g_filename_from_uri(uri:PAnsiChar; hostname:PPAnsiChar; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_from_uri';
+function g_filename_to_uri(filename:PAnsiChar; hostname:PAnsiChar; error:PPGError):Pgchar;cdecl;external gliblib name 'g_filename_to_uri';
 {$ENDIF read_interface_rest}

packages/gtk2/src/glib/gfileutils.inc

@@ -55,8 +55,8 @@ function g_file_error_quark:TGQuark;cdecl;external gliblib name 'g_file_error_qu
 function g_file_error_from_errno(err_no:gint):TGFileError;cdecl;external gliblib name 'g_file_error_from_errno';
 function g_file_test(filename:Pgchar; test:TGFileTest):gboolean;cdecl;external gliblib name 'g_file_test';
 function g_file_get_contents(filename:Pgchar; contents:PPgchar; length:Pgsize; error:PPGError):gboolean;cdecl;external gliblib name 'g_file_get_contents';
-function g_mkstemp(tmpl:Pchar):longint;cdecl;external gliblib name 'g_mkstemp';
-function g_file_open_tmp(tmpl:Pchar; name_used:PPchar; error:PPGError):longint;cdecl;external gliblib name 'g_file_open_tmp';
+function g_mkstemp(tmpl:PAnsiChar):longint;cdecl;external gliblib name 'g_mkstemp';
+function g_file_open_tmp(tmpl:PAnsiChar; name_used:PPAnsiChar; error:PPGError):longint;cdecl;external gliblib name 'g_file_open_tmp';
 
 {$IFNDEF KYLIX}
   function g_build_path(separator:Pgchar; first_element:Pgchar; args:array of const):Pgchar;cdecl;overload;external gliblib name 'g_build_path';

packages/gtk2/src/glib/glibconfig.inc

@@ -44,7 +44,7 @@
 {$IFDEF read_interface_types}
   PGSystemThread = ^TGSystemThread;
   TGSystemThread = record
-    data           : array [0..3] of char;
+    data           : array [0..3] of AnsiChar;
     dummy_double   : double;
     dummy_pointer  : pointer;
     dummy_long     : longint;

packages/gtk2/src/glib/gstrfuncs.inc

@@ -158,7 +158,7 @@ function g_strsplit(_string:Pgchar; delimiter:Pgchar; max_tokens:gint):PPgchar;
 function g_strjoinv(separator:Pgchar; str_array:PPgchar):Pgchar; cdecl; external gliblib;
 procedure g_strfreev(str_array:PPgchar); cdecl; external gliblib;
 function g_strdupv(str_array:PPgchar):PPgchar; cdecl; external gliblib;
-function g_stpcpy(dest:Pgchar; src:Pchar):Pgchar; cdecl; external gliblib;
+function g_stpcpy(dest:Pgchar; src:PAnsiChar):Pgchar; cdecl; external gliblib;
 {$ENDIF read_interface_rest}
 // included by glib2.pas
 

packages/gtk2/src/glib/gtypes.inc

@@ -17,9 +17,9 @@
    {$IFNDEF KYLIX}
    Pgchar   = ^gchar;
    {$ELSE}
-   Pgchar   = PChar;
+   Pgchar   = PAnsiChar;
    {$ENDIF}
-   gchar    = char;
+   gchar    = AnsiChar;
 
    Pgshort = ^gshort;
    gshort = cshort;

packages/gtk2/src/glib/gunicode.inc

@@ -92,7 +92,7 @@
        in case the locale's charset will be changed later using setlocale()
        or in some other way.
       }
-    function g_get_charset(charset:PPchar):gboolean;cdecl;external gliblib name 'g_get_charset';
+    function g_get_charset(charset:PPAnsiChar):gboolean;cdecl;external gliblib name 'g_get_charset';
 
     { These are all analogs of the <ctype.h> functions.
       }
@@ -210,7 +210,7 @@
     function g_unichar_to_utf8(c:gunichar; outbuf:Pgchar):gint;cdecl;external gliblib name 'g_unichar_to_utf8';
 
     { Validate a UTF8 string, return TRUE if valid, put pointer to
-       first invalid char in   end
+       first invalid AnsiChar in   end
       }
     function g_utf8_validate(str:Pgchar; max_len:gssize; _end:PPgchar):gboolean;cdecl;external gliblib name 'g_utf8_validate';
 

packages/gtk2/src/gtk+/gdk-pixbuf/gdk-pixbuf-loader.inc

@@ -29,7 +29,7 @@ function GDK_PIXBUF_LOADER_GET_CLASS(obj : pointer) : PGdkPixbufLoaderClass;
 
 function gdk_pixbuf_loader_get_type:GType; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_loader_new:PGdkPixbufLoader; cdecl; external gdkpixbuflib;
-function gdk_pixbuf_loader_new_with_type(image_type:Pchar; error:PPGError):PGdkPixbufLoader; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_loader_new_with_type(image_type:PAnsiChar; error:PPGError):PGdkPixbufLoader; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_loader_write(loader:PGdkPixbufLoader; buf:Pguchar; count:gsize; error:PPGError):gboolean; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_loader_get_pixbuf(loader:PGdkPixbufLoader):PGdkPixbuf; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_loader_get_animation(loader:PGdkPixbufLoader):PGdkPixbufAnimation; cdecl; external gdkpixbuflib;

packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas

@@ -81,12 +81,12 @@ var
   gdk_pixbuf_major_version: guint; external gdkpixbuflib name 'gdk_pixbuf_major_version';
   gdk_pixbuf_minor_version: guint; external gdkpixbuflib name 'gdk_pixbuf_minor_version';
   gdk_pixbuf_micro_version: guint; external gdkpixbuflib name 'gdk_pixbuf_micro_version';
-  gdk_pixbuf_version: PChar ; external gdkpixbuflib name 'gdk_pixbuf_version';
+  gdk_pixbuf_version: PAnsiChar ; external gdkpixbuflib name 'gdk_pixbuf_version';
   {$ELSE }
   gdk_pixbuf_major_version: guint;cvar;external;
   gdk_pixbuf_minor_version: guint;cvar;external;
   gdk_pixbuf_micro_version: guint;cvar;external;
-  gdk_pixbuf_version: PChar;cvar;external;
+  gdk_pixbuf_version: PAnsiChar;cvar;external;
   {$ENDIF }
 {$ENDIF}
 
@@ -192,17 +192,17 @@ function gdk_pixbuf_copy(pixbuf:PGdkPixbuf):PGdkPixbuf; cdecl; external gdkpixbu
 function gdk_pixbuf_new_subpixbuf(src_pixbuf:PGdkPixbuf; src_x:longint; src_y:longint; width:longint; height:longint):PGdkPixbuf; cdecl; external gdkpixbuflib;
 
 { Simple loading  }
-function gdk_pixbuf_new_from_file(filename:Pchar; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_new_from_file(filename:PAnsiChar; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_new_from_data(data:Pguchar; colorspace:TGdkColorspace; has_alpha:gboolean; bits_per_sample:longint; width:longint;
            height:longint; rowstride:longint; destroy_fn:TGdkPixbufDestroyNotify; destroy_fn_data:gpointer):PGdkPixbuf; cdecl; external gdkpixbuflib;
-function gdk_pixbuf_new_from_xpm_data(data:PPchar):PGdkPixbuf; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_new_from_xpm_data(data:PPAnsiChar):PGdkPixbuf; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_new_from_inline(data_length:gint; var data:guint8; copy_pixels:gboolean; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
 
 {$IFDEF HasGTK2_4}
-function gdk_pixbuf_new_from_file_at_size(filename:Pchar; width, height: gint;error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_new_from_file_at_size(filename:PAnsiChar; width, height: gint;error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
 {$ENDIF HasGTK2_4}
 {$IFDEF HasGTK2_6}
-function gdk_pixbuf_new_from_file_at_scale(filename:Pchar; width, height: gint; preserve_aspect_ratio: gboolean; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_new_from_file_at_scale(filename:PAnsiChar; width, height: gint; preserve_aspect_ratio: gboolean; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
 {$ENDIF HasGTK2_6}
 
 { Mutations  }
@@ -210,12 +210,12 @@ procedure gdk_pixbuf_fill(pixbuf:PGdkPixbuf; pixel:guint32); cdecl; external gdk
 
 { Saving  }
 {$IFNDEF KYLIX}
-function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:Pchar; _type:Pchar; error:PPGError; args:array of const):gboolean; cdecl; overload; external gdkpixbuflib;
-function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:Pchar; _type:Pchar; error:PPGError):gboolean; cdecl; overload; external gdkpixbuflib;
+function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:PAnsiChar; _type:PAnsiChar; error:PPGError; args:array of const):gboolean; cdecl; overload; external gdkpixbuflib;
+function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:PAnsiChar; _type:PAnsiChar; error:PPGError):gboolean; cdecl; overload; external gdkpixbuflib;
 {$ELSE}
-function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:Pchar; _type:Pchar; error:PPGError):gboolean; varargs; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_save(pixbuf:PGdkPixbuf; filename:PAnsiChar; _type:PAnsiChar; error:PPGError):gboolean; varargs; cdecl; external gdkpixbuflib;
 {$ENDIF}
-function gdk_pixbuf_savev(pixbuf:PGdkPixbuf; filename:Pchar; _type:Pchar; option_keys:PPchar; option_values:PPchar;
+function gdk_pixbuf_savev(pixbuf:PGdkPixbuf; filename:PAnsiChar; _type:PAnsiChar; option_keys:PPAnsiChar; option_values:PPAnsiChar;
            error:PPGError):gboolean; cdecl; external gdkpixbuflib;
 
 { Adding an alpha channel  }
@@ -251,7 +251,7 @@ function gdk_pixbuf_flip(src: PGdkPixbuf; horizontal: gboolean): PGdkPixbuf; cde
 
 { Animation support  }
 function gdk_pixbuf_animation_get_type:GType; cdecl; external gdkpixbuflib;
-function gdk_pixbuf_animation_new_from_file(filename:Pchar; error:PPGError):PGdkPixbufAnimation; cdecl; external gdkpixbuflib;
+function gdk_pixbuf_animation_new_from_file(filename:PAnsiChar; error:PPGError):PGdkPixbufAnimation; cdecl; external gdkpixbuflib;
 
 {$ifndef GDK_PIXBUF_DISABLE_DEPRECATED}
 function gdk_pixbuf_animation_ref(animation:PGdkPixbufAnimation):PGdkPixbufAnimation; cdecl; external gdkpixbuflib;

packages/gtk2/src/gtk+/gdk/gdk2.pas

@@ -114,8 +114,8 @@ procedure gdk_exit(error_code:gint); cdecl; external gdklib;
 { GDK_DISABLE_DEPRECATED  }
 
 function gdk_set_locale:Pgchar; cdecl; external gdklib;
-function gdk_get_program_class:Pchar; cdecl; external gdklib;
-procedure gdk_set_program_class(program_class:Pchar); cdecl; external gdklib;
+function gdk_get_program_class:PAnsiChar; cdecl; external gdklib;
+procedure gdk_set_program_class(program_class:PAnsiChar); cdecl; external gdklib;
 
 { Push and pop error handlers for X errors }
 procedure gdk_error_trap_push; cdecl; external gdklib;
@@ -165,7 +165,7 @@ procedure gdk_rectangle_union(src1:PGdkRectangle; src2:PGdkRectangle; dest:PGdkR
 function gdk_rectangle_get_type:GType; cdecl; external gdklib;
 function GDK_TYPE_RECTANGLE : GType;
 
-{ Conversion functions between wide char and multibyte strings. }
+{ Conversion functions between wide AnsiChar and multibyte strings. }
 function gdk_wcstombs(src:PGdkWChar):Pgchar; cdecl; external gdklib;
 function gdk_mbstowcs(dest:PGdkWChar; src:Pgchar; dest_max:gint):gint; cdecl; external gdklib;
 { Miscellaneous  }

packages/gtk2/src/gtk+/gdk/gdkevents.inc

@@ -289,7 +289,7 @@
    PmatDUMMY = ^TmatDUMMY;
    TmatDUMMY = record
        case longint of
-          0 : ( b : array[0..19] of char );
+          0 : ( b : array[0..19] of AnsiChar );
           1 : ( s : array[0..9] of smallint );
           2 : ( li : array[0..4] of longint );
        end;
@@ -303,7 +303,7 @@
         data_format : gushort;
         data : record
             case longint of
-               0 : ( b : array[0..19] of char );
+               0 : ( b : array[0..19] of AnsiChar );
                1 : ( s : array[0..9] of smallint );
                2 : ( l : array[0..4] of longint );
             end;
@@ -315,7 +315,7 @@
         window : PGdkWindow;
         send_event : gint8;
         action : TGdkSettingAction;
-        name : Pchar;
+        name : PAnsiChar;
      end;
 
    PGdkEventOwnerChange = ^TGdkEventOwnerChange;

packages/gtk2/src/gtk+/gtk/fnmatch.inc

@@ -33,7 +33,7 @@ const
 
 { Match STRING against the filename pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.   }
-function fnmatch(__pattern: char; __string: char;
+function fnmatch(__pattern: AnsiChar; __string: AnsiChar;
   __flags: gint): gint; cdecl; external gtklib;
 
 {$ENDIF read_interface_rest}

packages/gtk2/src/gtk+/gtk/gtk2.pas

@@ -108,7 +108,7 @@ const
 
 {$IFDEF KYLIX}
 Type
-  PPPchar   = PPPgchar;
+  PPPAnsiChar   = PPPgchar;
 {$ENDIF}
 
 

packages/gtk2/src/gtk+/gtk/gtkfilechooser.inc

@@ -50,10 +50,10 @@ procedure gtk_file_chooser_set_current_name(chooser:PGtkFileChooser; name:Pgchar
 
     { Filename manipulation    }
 function gtk_file_chooser_get_filename(chooser:PGtkFileChooser):Pgchar;cdecl;external gtklib name 'gtk_file_chooser_get_filename';
-function gtk_file_chooser_set_filename(chooser:PGtkFileChooser; filename:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_filename';
+function gtk_file_chooser_set_filename(chooser:PGtkFileChooser; filename:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_filename';
 
-function gtk_file_chooser_select_filename(chooser:PGtkFileChooser; filename:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_filename';
-procedure gtk_file_chooser_unselect_filename(chooser:PGtkFileChooser; filename:Pchar);cdecl;external gtklib name 'gtk_file_chooser_unselect_filename';
+function gtk_file_chooser_select_filename(chooser:PGtkFileChooser; filename:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_filename';
+procedure gtk_file_chooser_unselect_filename(chooser:PGtkFileChooser; filename:PAnsiChar);cdecl;external gtklib name 'gtk_file_chooser_unselect_filename';
 
 procedure gtk_file_chooser_select_all(chooser:PGtkFileChooser);cdecl;external gtklib name 'gtk_file_chooser_select_all';
 procedure gtk_file_chooser_unselect_all(chooser:PGtkFileChooser);cdecl;external gtklib name 'gtk_file_chooser_unselect_all';
@@ -66,10 +66,10 @@ function gtk_file_chooser_get_current_folder(chooser:PGtkFileChooser):Pgchar;cde
 {$IFDEF WINDOWS}
 {$IFDEF USEUTF8}
 function gtk_file_chooser_get_filename_utf8(chooser:PGtkFileChooser):Pgchar;cdecl;external gtklib name 'gtk_file_chooser_get_filename_utf8';
-function gtk_file_chooser_set_filename_utf8(chooser:PGtkFileChooser; filename:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_filename_utf8';
+function gtk_file_chooser_set_filename_utf8(chooser:PGtkFileChooser; filename:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_filename_utf8';
 
-function gtk_file_chooser_select_filename_utf8(chooser:PGtkFileChooser; filename:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_filename_utf8';
-procedure gtk_file_chooser_unselect_filename_utf8(chooser:PGtkFileChooser; filename:Pchar);cdecl;external gtklib name 'gtk_file_chooser_unselect_filename_utf8';
+function gtk_file_chooser_select_filename_utf8(chooser:PGtkFileChooser; filename:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_filename_utf8';
+procedure gtk_file_chooser_unselect_filename_utf8(chooser:PGtkFileChooser; filename:PAnsiChar);cdecl;external gtklib name 'gtk_file_chooser_unselect_filename_utf8';
 
 
 function gtk_file_chooser_get_filenames_utf8(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_get_filenames_utf8';
@@ -81,10 +81,10 @@ function gtk_file_chooser_get_current_folder_utf8(chooser:PGtkFileChooser):Pgcha
 
 { URI manipulation }
 function gtk_file_chooser_get_uri(chooser:PGtkFileChooser):Pgchar;cdecl;external gtklib name 'gtk_file_chooser_get_uri';
-function gtk_file_chooser_set_uri(chooser:PGtkFileChooser; uri:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_uri';
+function gtk_file_chooser_set_uri(chooser:PGtkFileChooser; uri:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_set_uri';
 
-function gtk_file_chooser_select_uri(chooser:PGtkFileChooser; uri:Pchar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_uri';
-procedure gtk_file_chooser_unselect_uri(chooser:PGtkFileChooser; uri:Pchar);cdecl;external gtklib name 'gtk_file_chooser_unselect_uri';
+function gtk_file_chooser_select_uri(chooser:PGtkFileChooser; uri:PAnsiChar):gboolean;cdecl;external gtklib name 'gtk_file_chooser_select_uri';
+procedure gtk_file_chooser_unselect_uri(chooser:PGtkFileChooser; uri:PAnsiChar);cdecl;external gtklib name 'gtk_file_chooser_unselect_uri';
 
 function gtk_file_chooser_get_uris(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_get_uris';
 
@@ -103,12 +103,12 @@ function gtk_file_chooser_get_preview_widget_active(chooser:PGtkFileChooser):gbo
 procedure gtk_file_chooser_set_use_preview_label(chooser:PGtkFileChooser; use_label:gboolean);cdecl;external gtklib name 'gtk_file_chooser_set_use_preview_label';
 function gtk_file_chooser_get_use_preview_label(chooser:PGtkFileChooser):gboolean;cdecl;external gtklib name 'gtk_file_chooser_get_use_preview_label';
 
-function gtk_file_chooser_get_preview_filename(chooser:PGtkFileChooser):Pchar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_filename';
-function gtk_file_chooser_get_preview_uri(chooser:PGtkFileChooser):Pchar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_uri';
+function gtk_file_chooser_get_preview_filename(chooser:PGtkFileChooser):PAnsiChar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_filename';
+function gtk_file_chooser_get_preview_uri(chooser:PGtkFileChooser):PAnsiChar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_uri';
 {$IFDEF WINDOWS}
 {$IFDEF USEUTF8}
-function gtk_file_chooser_get_preview_filename_utf8(chooser:PGtkFileChooser):Pchar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_filename_utf8';
-function gtk_file_chooser_get_preview_uri_utf8(chooser:PGtkFileChooser):Pchar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_uri_utf8';
+function gtk_file_chooser_get_preview_filename_utf8(chooser:PGtkFileChooser):PAnsiChar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_filename_utf8';
+function gtk_file_chooser_get_preview_uri_utf8(chooser:PGtkFileChooser):PAnsiChar;cdecl;external gtklib name 'gtk_file_chooser_get_preview_uri_utf8';
 {$ENDIF}
 {$ENDIF}
 
@@ -126,20 +126,20 @@ procedure gtk_file_chooser_set_filter(chooser:PGtkFileChooser; filter:PGtkFileFi
 function gtk_file_chooser_get_filter(chooser:PGtkFileChooser):PGtkFileFilter;cdecl;external gtklib name 'gtk_file_chooser_get_filter';
 
 { Per-application shortcut folders  }
-function gtk_file_chooser_add_shortcut_folder(chooser:PGtkFileChooser; folder:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder';
-function gtk_file_chooser_remove_shortcut_folder(chooser:PGtkFileChooser; folder:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder';
+function gtk_file_chooser_add_shortcut_folder(chooser:PGtkFileChooser; folder:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder';
+function gtk_file_chooser_remove_shortcut_folder(chooser:PGtkFileChooser; folder:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder';
 function gtk_file_chooser_list_shortcut_folders(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_list_shortcut_folders';
 
 {$IFDEF WINDOWS}
 {$IFDEF USEUTF8}
-function gtk_file_chooser_add_shortcut_folder_utf8(chooser:PGtkFileChooser; folder:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder_utf8';
-function gtk_file_chooser_remove_shortcut_folder_utf8(chooser:PGtkFileChooser; folder:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder_utf8';
+function gtk_file_chooser_add_shortcut_folder_utf8(chooser:PGtkFileChooser; folder:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder_utf8';
+function gtk_file_chooser_remove_shortcut_folder_utf8(chooser:PGtkFileChooser; folder:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder_utf8';
 function gtk_file_chooser_list_shortcut_folders_utf8(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_list_shortcut_folders_utf8';
 {$ENDIF}
 {$ENDIF}
 
-function gtk_file_chooser_add_shortcut_folder_uri(chooser:PGtkFileChooser; uri:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder_uri';
-function gtk_file_chooser_remove_shortcut_folder_uri(chooser:PGtkFileChooser; uri:Pchar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder_uri';
+function gtk_file_chooser_add_shortcut_folder_uri(chooser:PGtkFileChooser; uri:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_add_shortcut_folder_uri';
+function gtk_file_chooser_remove_shortcut_folder_uri(chooser:PGtkFileChooser; uri:PAnsiChar; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_chooser_remove_shortcut_folder_uri';
 function gtk_file_chooser_list_shortcut_folder_uris(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_list_shortcut_folder_uris';
 
 {$ifdef HasGTK2_6}

packages/gtk2/src/gtk+/gtk/gtkfilechooserdefault.inc

@@ -20,7 +20,7 @@ function GTK_IS_FILE_CHOOSER_DEFAULT(obj : pointer) : gboolean;
 
 function _gtk_file_chooser_default_get_type:GType;cdecl;external gtklib name '_gtk_file_chooser_default_get_type';
 
-function _gtk_file_chooser_default_new(file_system:Pchar):PGtkWidget;cdecl;external gtklib name '_gtk_file_chooser_default_new';
+function _gtk_file_chooser_default_new(file_system:PAnsiChar):PGtkWidget;cdecl;external gtklib name '_gtk_file_chooser_default_new';
 
 {$ENDIF}
 

packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc

@@ -69,7 +69,7 @@ type
         volume_get_base_path : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):PGtkFilePath;
         volume_get_is_mounted : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):gboolean;
         volume_mount : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume; error:PPGError):gboolean;
-        volume_get_display_name : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):Pchar;
+        volume_get_display_name : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):PAnsiChar;
         volume_render_icon : function (file_system:PGtkFileSystem; volume:PGtkFileSystemVolume; widget:PGtkWidget; pixel_size:gint; error:PPGError):PGdkPixbuf;
         get_parent : function (file_system:PGtkFileSystem; path:PGtkFilePath; parent:PPGtkFilePath; error:PPGError):gboolean;
         make_path : function (file_system:PGtkFileSystem; base_path:PGtkFilePath; display_name:Pgchar; error:PPGError):PGtkFilePath;
@@ -177,7 +177,7 @@ function gtk_file_system_volume_get_base_path(file_system:PGtkFileSystem; volume
 function gtk_file_system_volume_get_is_mounted(file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):gboolean;cdecl;external gtklib name 'gtk_file_system_volume_get_is_mounted';
 function gtk_file_system_volume_mount(file_system:PGtkFileSystem; volume:PGtkFileSystemVolume; error:PPGError):gboolean;cdecl;external gtklib name 'gtk_file_system_volume_mount';
 
-function gtk_file_system_volume_get_display_name(file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):Pchar;cdecl;external gtklib name 'gtk_file_system_volume_get_display_name';
+function gtk_file_system_volume_get_display_name(file_system:PGtkFileSystem; volume:PGtkFileSystemVolume):PAnsiChar;cdecl;external gtklib name 'gtk_file_system_volume_get_display_name';
 
 function gtk_file_system_volume_render_icon(file_system:PGtkFileSystem; volume:PGtkFileSystemVolume; widget:PGtkWidget; pixel_size:gint; error:PPGError):PGdkPixbuf;cdecl;external gtklib name 'gtk_file_system_volume_render_icon';
 
@@ -240,7 +240,7 @@ procedure gtk_file_paths_free(paths:PGSList);cdecl;external gtklib name 'gtk_fil
 
 { GtkFileSystem modules support  }
 
-function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create';
+function _gtk_file_system_create(file_system_name:PAnsiChar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create';
 
 {$endif HasGTK_FileSystem}
 

packages/gtk2/src/gtk+/gtk/gtkiconfactory.inc

@@ -71,7 +71,7 @@ function gtk_icon_set_copy(icon_set:PGtkIconSet):PGtkIconSet; cdecl; external gt
    necessary.
   }
 function gtk_icon_set_render_icon(icon_set:PGtkIconSet; style:PGtkStyle; direction:TGtkTextDirection; state:TGtkStateType; size:TGtkIconSize;
-           widget:PGtkWidget; detail:Pchar):PGdkPixbuf; cdecl; external gtklib;
+           widget:PGtkWidget; detail:PAnsiChar):PGdkPixbuf; cdecl; external gtklib;
 procedure gtk_icon_set_add_source(icon_set:PGtkIconSet; source:PGtkIconSource); cdecl; external gtklib;
 procedure gtk_icon_set_get_sizes(icon_set:PGtkIconSet; sizes:PPGtkIconSize; n_sizes:pgint); cdecl; external gtklib;
 function gtk_icon_source_get_type:GType; cdecl; external gtklib;

packages/gtk2/src/gtk+/gtk/gtkicontheme.inc

@@ -107,7 +107,7 @@ function gtk_icon_theme_load_icon(icon_theme:PGtkIconTheme; icon_name:Pgchar; si
 
 function gtk_icon_theme_list_icons(icon_theme:PGtkIconTheme; context:Pgchar):PGList;cdecl;external gtklib name 'gtk_icon_theme_list_icons';
 
-function gtk_icon_theme_get_example_icon_name(icon_theme:PGtkIconTheme):Pchar;cdecl;external gtklib name 'gtk_icon_theme_get_example_icon_name';
+function gtk_icon_theme_get_example_icon_name(icon_theme:PGtkIconTheme):PAnsiChar;cdecl;external gtklib name 'gtk_icon_theme_get_example_icon_name';
 
 function gtk_icon_theme_rescan_if_needed(icon_theme:PGtkIconTheme):gboolean;cdecl;external gtklib name 'gtk_icon_theme_rescan_if_needed';
 

packages/gtk2/src/gtk+/gtk/gtklabel.inc

@@ -74,9 +74,9 @@ procedure set_use_markup(var a : TGtkLabel; __use_markup : guint);
 
 
 function gtk_label_get_type:TGtkType; cdecl; external gtklib;
-function gtk_label_new(str:Pchar):PGtkWidget; cdecl; external gtklib;
-function gtk_label_new_with_mnemonic(str:Pchar):PGtkWidget; cdecl; external gtklib;
-procedure gtk_label_set_text(_label:PGtkLabel; str:Pchar); cdecl; external gtklib;
+function gtk_label_new(str:PAnsiChar):PGtkWidget; cdecl; external gtklib;
+function gtk_label_new_with_mnemonic(str:PAnsiChar):PGtkWidget; cdecl; external gtklib;
+procedure gtk_label_set_text(_label:PGtkLabel; str:PAnsiChar); cdecl; external gtklib;
 function gtk_label_get_text(_label:PGtkLabel):Pgchar; cdecl; external gtklib;
 procedure gtk_label_set_attributes(_label:PGtkLabel; attrs:PPangoAttrList); cdecl; external gtklib;
 function gtk_label_get_attributes(_label:PGtkLabel):PPangoAttrList; cdecl; external gtklib;
@@ -105,8 +105,8 @@ function gtk_label_get_layout(_label:PGtkLabel):PPangoLayout; cdecl; external gt
 procedure gtk_label_get_layout_offsets(_label:PGtkLabel; x:Pgint; y:Pgint); cdecl; external gtklib;
 
 {$ifndef GTK_DISABLE_DEPRECATED}
-procedure gtk_label_set(_label:PGtkLabel; str:Pchar);
-procedure gtk_label_get(_label:PGtkLabel; str:PPchar); cdecl; external gtklib;
+procedure gtk_label_set(_label:PGtkLabel; str:PAnsiChar);
+procedure gtk_label_get(_label:PGtkLabel; str:PPAnsiChar); cdecl; external gtklib;
 function gtk_label_parse_uline(_label:PGtkLabel; _string:Pgchar):guint; cdecl; external gtklib;
 {$endif}
 
@@ -199,7 +199,7 @@ begin
 end;
 
 {$ifndef GTK_DISABLE_DEPRECATED}
-procedure gtk_label_set(_label:PGtkLabel; str:Pchar);
+procedure gtk_label_set(_label:PGtkLabel; str:PAnsiChar);
 begin
    gtk_label_set_text(_label,str);
 end;

packages/gtk2/src/gtk+/gtk/gtkmain.inc

@@ -56,15 +56,15 @@ function gtk_check_version(required_major:guint; required_minor:guint; required_
 
 {$ifndef G_PLATFORM_WIN32}
 { Initialization, exit, mainloop and miscellaneous routines }
-procedure gtk_init(argc:Plongint; argv:PPPchar); cdecl; external gtklib;
-function gtk_init_check(argc:Plongint; argv:PPPchar):gboolean; cdecl; external gtklib;
+procedure gtk_init(argc:Plongint; argv:PPPAnsiChar); cdecl; external gtklib;
+function gtk_init_check(argc:Plongint; argv:PPPAnsiChar):gboolean; cdecl; external gtklib;
 {$else}
 { Variants that are used to check for correct struct packing
    when building GTK+-using code. }
-procedure gtk_init_abi_check(argc:Plongint; argv:PPPchar; num_checks:longint; sizeof_GtkWindow:Tsize_t; sizeof_GtkBox:Tsize_t); cdecl; external gtklib;
-function gtk_init_check_abi_check(argc:Plongint; argv:PPPchar; num_checks:longint; sizeof_GtkWindow:Tsize_t; sizeof_GtkBox:Tsize_t):gboolean; cdecl; external gtklib;
-procedure gtk_init(argc: Plongint; argv : PPPchar);
-function gtk_init_check(argc: Plongint; argv : PPPchar) : gboolean;
+procedure gtk_init_abi_check(argc:Plongint; argv:PPPAnsiChar; num_checks:longint; sizeof_GtkWindow:Tsize_t; sizeof_GtkBox:Tsize_t); cdecl; external gtklib;
+function gtk_init_check_abi_check(argc:Plongint; argv:PPPAnsiChar; num_checks:longint; sizeof_GtkWindow:Tsize_t; sizeof_GtkBox:Tsize_t):gboolean; cdecl; external gtklib;
+procedure gtk_init(argc: Plongint; argv : PPPAnsiChar);
+function gtk_init_check(argc: Plongint; argv : PPPAnsiChar) : gboolean;
 {$endif G_PLATFORM_WIN32}
 
 
@@ -125,8 +125,8 @@ function _gtk_get_module_path(_type:Pgchar):PPgchar; cdecl; external gtklib;
 
 {$ifdef HasGTK2_6}
 function gtk_get_option_group(open_default_display:gboolean):PGOptionGroup; cdecl; external gtklib;
-function gtk_init_with_args(argc:PLongint; argv:PPPchar; parameter_string:Pchar; 
-  entries:PGOptionEntry; translation_domain:Pchar; error:PPGError):gboolean; cdecl; external gtklib;
+function gtk_init_with_args(argc:PLongint; argv:PPPAnsiChar; parameter_string:PAnsiChar; 
+  entries:PGOptionEntry; translation_domain:PAnsiChar; error:PPGError):gboolean; cdecl; external gtklib;
 {$endif}
 
 {$ENDIF read_interface_rest}
@@ -135,12 +135,12 @@ function gtk_init_with_args(argc:PLongint; argv:PPPchar; parameter_string:Pchar;
 
 {$IFDEF read_implementation}
 {$ifdef G_PLATFORM_WIN32}
-procedure gtk_init(argc: Plongint; argv : PPPchar);
+procedure gtk_init(argc: Plongint; argv : PPPAnsiChar);
 begin
    gtk_init_abi_check(argc,argv,2,sizeof(TGtkWindow),sizeof(TGtkBox));
 end;
 
-function gtk_init_check(argc: Plongint; argv : PPPchar) : gboolean;
+function gtk_init_check(argc: Plongint; argv : PPPAnsiChar) : gboolean;
 begin
    gtk_init_check:=gtk_init_check_abi_check(argc,argv,2,sizeof(TGtkWindow),sizeof(TGtkBox));
 end;

packages/gtk2/src/gtk+/gtk/gtkrc.inc

@@ -148,7 +148,7 @@ procedure gtk_rc_add_default_file(filename:Pgchar); cdecl; external gtklib;
 procedure gtk_rc_set_default_files(filenames:PPgchar); cdecl; external gtklib;
 function gtk_rc_get_default_files:PPgchar; cdecl; external gtklib;
 function gtk_rc_get_style(widget:PGtkWidget):PGtkStyle; cdecl; external gtklib;
-function gtk_rc_get_style_by_paths(settings:PGtkSettings; widget_path:Pchar; class_path:Pchar; _type:GType):PGtkStyle; cdecl; external gtklib;
+function gtk_rc_get_style_by_paths(settings:PGtkSettings; widget_path:PAnsiChar; class_path:PAnsiChar; _type:GType):PGtkStyle; cdecl; external gtklib;
 function gtk_rc_reparse_all_for_settings(settings:PGtkSettings; force_load:gboolean):gboolean; cdecl; external gtklib;
 function gtk_rc_find_pixmap_in_path(settings:PGtkSettings; scanner:PGScanner; pixmap_file:Pgchar):Pgchar; cdecl; external gtklib;
 procedure gtk_rc_parse(filename:Pgchar); cdecl; external gtklib;

packages/gtk2/src/gtk+/gtk/gtktext.inc

@@ -23,7 +23,7 @@
 { The text, a single segment of text a'la emacs, with a gap
      where insertion occurs.  }
 { The allocated length of the text segment.  }
-{ The gap position, index into address where a char
+{ The gap position, index into address where a AnsiChar
      should be inserted.  }
 { The gap size, s.t.  (text + gap_position + gap_size) is
      the first valid character following the gap.  }
@@ -162,7 +162,7 @@ function gtk_text_get_length(text:PGtkText):guint; cdecl; external gtklib;
 procedure gtk_text_freeze(text:PGtkText); cdecl; external gtklib;
 procedure gtk_text_thaw(text:PGtkText); cdecl; external gtklib;
 
-procedure gtk_text_insert(text:PGtkText; font:PGdkFont; fore:PGdkColor; back:PGdkColor; chars:Pchar;
+procedure gtk_text_insert(text:PGtkText; font:PGdkFont; fore:PGdkColor; back:PGdkColor; chars:PAnsiChar;
             length:gint); cdecl; external gtklib;
 function gtk_text_backward_delete(text:PGtkText; nchars:guint):gboolean; cdecl; external gtklib;
 function gtk_text_forward_delete(text:PGtkText; nchars:guint):gboolean; cdecl; external gtklib;
@@ -250,7 +250,7 @@ begin
       Result:=t^.text.wc[index+t^.gap_size];
     end;
   end else begin
-    writeln('GTK_TEXT_INDEX_WCHAR ERROR: t does not use wide char');
+    writeln('GTK_TEXT_INDEX_WCHAR ERROR: t does not use wide AnsiChar');
     Result:=0;
   end;
 {$ENDIF}
@@ -260,7 +260,7 @@ function GTK_TEXT_INDEX_UCHAR(t: PGtkText; index: guint): GUChar;
 begin
 {$IFNDEF KYLIX}
   if Use_WChar(t) then begin
-    writeln('GTK_TEXT_INDEX_WCHAR ERROR: t does not use unsigned char');
+    writeln('GTK_TEXT_INDEX_WCHAR ERROR: t does not use unsigned AnsiChar');
     Result:=0;
   end else begin
     if index < t^.gap_position then begin

packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc

@@ -153,7 +153,7 @@ procedure gtk_text_buffer_get_bounds(buffer:PGtkTextBuffer; start:PGtkTextIter;
 procedure gtk_text_buffer_get_iter_at_mark(buffer:PGtkTextBuffer; iter:PGtkTextIter; mark:PGtkTextMark); cdecl; external gtklib;
 procedure gtk_text_buffer_get_iter_at_child_anchor(buffer:PGtkTextBuffer; iter:PGtkTextIter; anchor:PGtkTextChildAnchor); cdecl; external gtklib;
 { There's no get_first_iter because you just get the iter for
-   line or char 0  }
+   line or AnsiChar 0  }
 { Used to keep track of whether the buffer needs saving; anytime the
    buffer contents change, the modified flag is turned on. Whenever
    you save, turn it off. Tags and marks do not affect the modified

packages/gtk2/src/gtk+/gtk/gtktextiter.inc

@@ -76,8 +76,8 @@ function gtk_text_iter_get_visible_line_index(iter:PGtkTextIter):gint; cdecl; ex
 
 function gtk_text_iter_get_char(iter:PGtkTextIter):gunichar; cdecl; external gtklib;
 
-{ includes the 0xFFFC char for pixmaps/widgets, so char offsets
-   into the returned string map properly into buffer char offsets
+{ includes the 0xFFFC AnsiChar for pixmaps/widgets, so AnsiChar offsets
+   into the returned string map properly into buffer AnsiChar offsets
   }
 function gtk_text_iter_get_slice(start:PGtkTextIter; theEnd:PGtkTextIter):Pgchar; cdecl; external gtklib;
 

packages/gtk2/src/gtk+/gtk/gtktextsegment.inc

@@ -62,7 +62,7 @@
         byte_count : longint;
         body : record
             case longint of
-               0 : ( chars : array[0..3] of char );
+               0 : ( chars : array[0..3] of AnsiChar );
                1 : ( toggle : TGtkTextToggleBody );
                2 : ( mark : TGtkTextMarkBody );
                3 : ( pixbuf : TGtkTextPixbuf );
@@ -126,7 +126,7 @@
                                           to check internal consistency of
                                           segment.  }
    TGtkTextLineSegmentClass = record
-        name : Pchar;
+        name : PAnsiChar;
         leftGravity : gboolean;
         splitFunc : TGtkTextSegSplitFunc;
         deleteFunc : TGtkTextSegDeleteFunc;

packages/gtk2/src/gtk+/gtk/gtktexttag.inc

@@ -32,7 +32,7 @@
    TGtkTextTag = record
         parent_instance : TGObject;
         table : PGtkTextTagTable;
-        name : Pchar;
+        name : PAnsiChar;
         priority : longint;
         values : PGtkTextAttributes;
         flag0 : longint;

packages/gtk2/src/gtk+/gtk/gtktextutil.inc

@@ -43,7 +43,7 @@ Type
 
 type
 
-   TGtkTextUtilCharChosenFunc = procedure (text:Pchar; data:gpointer); cdecl;
+   TGtkTextUtilCharChosenFunc = procedure (text:PAnsiChar; data:gpointer); cdecl;
 
 procedure _gtk_text_util_append_special_char_menuitems(menushell:PGtkMenuShell; func:TGtkTextUtilCharChosenFunc; data:gpointer); cdecl; external gtklib;
 { C++ end of extern C conditionnal removed }

packages/gtk2/src/gtk+/gtk/gtktoolbar.inc

@@ -84,14 +84,14 @@ procedure set_icon_size_set(var a : TGtkToolbar; __icon_size_set : guint);
 function gtk_toolbar_get_type:TGtkType; cdecl; external gtklib;
 function gtk_toolbar_new:PGtkWidget; cdecl; external gtklib;
 { Simple button items  }
-function gtk_toolbar_append_item(toolbar:PGtkToolbar; text:Pchar; tooltip_text:Pchar; tooltip_private_text:Pchar; icon:PGtkWidget;
+function gtk_toolbar_append_item(toolbar:PGtkToolbar; text:PAnsiChar; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar; icon:PGtkWidget;
            callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
-function gtk_toolbar_prepend_item(toolbar:PGtkToolbar; text:Pchar; tooltip_text:Pchar; tooltip_private_text:Pchar; icon:PGtkWidget;
+function gtk_toolbar_prepend_item(toolbar:PGtkToolbar; text:PAnsiChar; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar; icon:PGtkWidget;
            callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
-function gtk_toolbar_insert_item(toolbar:PGtkToolbar; text:Pchar; tooltip_text:Pchar; tooltip_private_text:Pchar; icon:PGtkWidget;
+function gtk_toolbar_insert_item(toolbar:PGtkToolbar; text:PAnsiChar; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar; icon:PGtkWidget;
            callback:TGtkSignalFunc; user_data:gpointer; position:gint):PGtkWidget; cdecl; external gtklib;
 { Stock Items  }
-function gtk_toolbar_insert_stock(toolbar:PGtkToolbar; stock_id:Pgchar; tooltip_text:Pchar; tooltip_private_text:Pchar; callback:TGtkSignalFunc;
+function gtk_toolbar_insert_stock(toolbar:PGtkToolbar; stock_id:Pgchar; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar; callback:TGtkSignalFunc;
            user_data:gpointer; position:gint):PGtkWidget; cdecl; external gtklib;
 { Space Items  }
 procedure gtk_toolbar_append_space(toolbar:PGtkToolbar); cdecl; external gtklib;
@@ -99,16 +99,16 @@ procedure gtk_toolbar_prepend_space(toolbar:PGtkToolbar); cdecl; external gtklib
 procedure gtk_toolbar_insert_space(toolbar:PGtkToolbar; position:gint); cdecl; external gtklib;
 procedure gtk_toolbar_remove_space(toolbar:PGtkToolbar; position:gint); cdecl; external gtklib;
 { Any element type  }
-function gtk_toolbar_append_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:Pchar; tooltip_text:Pchar;
-           tooltip_private_text:Pchar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
-function gtk_toolbar_prepend_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:Pchar; tooltip_text:Pchar;
-           tooltip_private_text:Pchar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
-function gtk_toolbar_insert_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:Pchar; tooltip_text:Pchar;
-           tooltip_private_text:Pchar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer; position:gint):PGtkWidget; cdecl; external gtklib;
+function gtk_toolbar_append_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:PAnsiChar; tooltip_text:PAnsiChar;
+           tooltip_private_text:PAnsiChar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
+function gtk_toolbar_prepend_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:PAnsiChar; tooltip_text:PAnsiChar;
+           tooltip_private_text:PAnsiChar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer):PGtkWidget; cdecl; external gtklib;
+function gtk_toolbar_insert_element(toolbar:PGtkToolbar; _type:TGtkToolbarChildType; widget:PGtkWidget; text:PAnsiChar; tooltip_text:PAnsiChar;
+           tooltip_private_text:PAnsiChar; icon:PGtkWidget; callback:TGtkSignalFunc; user_data:gpointer; position:gint):PGtkWidget; cdecl; external gtklib;
 { Generic Widgets  }
-procedure gtk_toolbar_append_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:Pchar; tooltip_private_text:Pchar); cdecl; external gtklib;
-procedure gtk_toolbar_prepend_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:Pchar; tooltip_private_text:Pchar); cdecl; external gtklib;
-procedure gtk_toolbar_insert_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:Pchar; tooltip_private_text:Pchar; position:gint); cdecl; external gtklib;
+procedure gtk_toolbar_append_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar); cdecl; external gtklib;
+procedure gtk_toolbar_prepend_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar); cdecl; external gtklib;
+procedure gtk_toolbar_insert_widget(toolbar:PGtkToolbar; widget:PGtkWidget; tooltip_text:PAnsiChar; tooltip_private_text:PAnsiChar; position:gint); cdecl; external gtklib;
 { Style functions  }
 procedure gtk_toolbar_set_orientation(toolbar:PGtkToolbar; orientation:TGtkOrientation); cdecl; external gtklib;
 procedure gtk_toolbar_set_style(toolbar:PGtkToolbar; style:TGtkToolbarStyle); cdecl; external gtklib;

packages/gtk2/src/gtk2x11/include/gdkx.inc

@@ -106,7 +106,7 @@ function gdk_x11_get_xatom_name(xatom:TAtom):Pgchar;cdecl;external;
 function gdk_x11_font_get_xdisplay(font:PGdkFont):PDisplay;cdecl;external;
 function gdk_x11_font_get_xfont(font:PGdkFont):gpointer;cdecl;external;
 (* Const before type ignored *)
-function gdk_x11_font_get_name(font:PGdkFont):Pchar;cdecl;external;
+function gdk_x11_font_get_name(font:PGdkFont):PAnsiChar;cdecl;external;
 function GDK_FONT_XDISPLAY(font : PGdkFont): PDisplay;
 function GDK_FONT_XFONT(font : PGdkFont): gpointer;
 

packages/gtk2/src/gtk2x11/include/xsettings-client.inc

@@ -14,14 +14,14 @@ type
   PXSettingsClient = pointer;
 
 type
-  TXSettingsNotifyFunc = procedure (name:Pchar; action:TXSettingsAction; setting:PXSettingsSetting; cb_data:pointer);cdecl;
+  TXSettingsNotifyFunc = procedure (name:PAnsiChar; action:TXSettingsAction; setting:PXSettingsSetting; cb_data:pointer);cdecl;
 
   TXSettingsWatchFunc = procedure (window:TWindow; is_start:TBool; mask:longint; cb_data:pointer);cdecl;
 
 function xsettings_client_new(display:PDisplay; screen:longint; notify:TXSettingsNotifyFunc; watch:TXSettingsWatchFunc; cb_data:pointer):PXSettingsClient;cdecl;external;
 procedure xsettings_client_destroy(client:PXSettingsClient);cdecl;external;
 function xsettings_client_process_event(client:PXSettingsClient; xev:PXEvent):TBool;cdecl;external;
-function xsettings_client_get_setting(client:PXSettingsClient; name:Pchar; setting:PPXSettingsSetting):TXSettingsResult;cdecl;external;
+function xsettings_client_get_setting(client:PXSettingsClient; name:PAnsiChar; setting:PPXSettingsSetting):TXSettingsResult;cdecl;external;
 
 {$ENDIF read_interface_rest}
 

packages/gtk2/src/gtk2x11/include/xsettings-common.inc

@@ -45,7 +45,7 @@ Const
 type
    PXSettingsBuffer = ^TXSettingsBuffer;
    TXSettingsBuffer = record
-        byte_order : char;
+        byte_order : AnsiChar;
         len : size_t;
         data : Pbyte;
         pos : Pbyte;
@@ -61,12 +61,12 @@ type
 
    PXSettingsSetting = ^TXSettingsSetting;
    TXSettingsSetting = record
-        name : Pchar;
+        name : PAnsiChar;
         _type : TXSettingsType;
         data : record
             case longint of
                0 : ( v_int : longint );
-               1 : ( v_string : Pchar );
+               1 : ( v_string : PAnsiChar );
                2 : ( v_color : TXSettingsColor );
             end;
         last_change_serial : dword;
@@ -89,12 +89,12 @@ function xsettings_list_copy(list:PXSettingsList):PXSettingsList;cdecl;external;
 function xsettings_list_insert(list:PPXSettingsList; setting:PXSettingsSetting):TXSettingsResult;cdecl;external;
 
 (* Const before type ignored *)
-function xsettings_list_lookup(list:PXSettingsList; name:Pchar):PXSettingsSetting;cdecl;external;
+function xsettings_list_lookup(list:PXSettingsList; name:PAnsiChar):PXSettingsSetting;cdecl;external;
 
 (* Const before type ignored *)
-function xsettings_list_delete(list:PPXSettingsList; name:Pchar):TXSettingsResult;cdecl;external;
+function xsettings_list_delete(list:PPXSettingsList; name:PAnsiChar):TXSettingsResult;cdecl;external;
 
-function xsettings_byte_order:char;cdecl;external;
+function xsettings_byte_order:AnsiChar;cdecl;external;
 
 function XSETTINGS_PAD(n,m : longint) : longint;
 

packages/gtk2/src/gtkext/gtk2ext.pp

@@ -11,12 +11,12 @@ const
   { This is equired when people don't have -dev/-devel packages on linux.
     I'm not sure how Darwin is handled tho }
   {$ifdef windows}
-  GtkLibNames: array[1..1] of string = (gtklib);
+  GtkLibNames: array[1..1] of ansistring = (gtklib);
   {$else}
     {$ifdef darwin} // Mac/Darwin
-    GtkLibNames: array[1..1] of string = (gtklib); // TODO: I don't know this one!
+    GtkLibNames: array[1..1] of ansistring = (gtklib); // TODO: I don't know this one!
     {$else} // BSD, Solaris, Linux
-    GtkLibNames: array[1..2] of string = (gtklib, gtklib + '.0');
+    GtkLibNames: array[1..2] of ansistring = (gtklib, gtklib + '.0');
     {$endif}
   {$endif}
   

packages/gtk2/src/gtkglext/gdkglinit.inc

@@ -6,11 +6,11 @@
  * Initialization routines.
  *}
 
-function gdk_gl_parse_args(argc: Plongint; argv: PPPChar): gboolean;
+function gdk_gl_parse_args(argc: Plongint; argv: PPPAnsiChar): gboolean;
   cdecl; external GdkGLExtLib;
-function gdk_gl_init_check(argc: Plongint; argv: PPPChar): gboolean;
+function gdk_gl_init_check(argc: Plongint; argv: PPPAnsiChar): gboolean;
   cdecl; external GdkGLExtLib;
-procedure gdk_gl_init(argc: Plongint; argv: PPPChar);
+procedure gdk_gl_init(argc: Plongint; argv: PPPAnsiChar);
   cdecl; external GdkGLExtLib;
 
 {$endif read_interface_rest}

packages/gtk2/src/gtkglext/gdkglquery.inc

@@ -25,10 +25,10 @@ function gdk_gl_query_version_for_display(
   cdecl; external GdkGLExtLib;
 {$endif GDKGLEXT_MULTIHEAD_SUPPORT}
 
-function gdk_gl_query_gl_extension(extension: PChar): gboolean;
+function gdk_gl_query_gl_extension(extension: PAnsiChar): gboolean;
   cdecl; external GdkGLExtLib;
 
-function gdk_gl_get_proc_address(proc_name: PChar): TGdkGLProc;
+function gdk_gl_get_proc_address(proc_name: PAnsiChar): TGdkGLProc;
   cdecl; external GdkGLExtLib;
 
 {$endif read_interface_rest}

packages/gtk2/src/gtkglext/gtkglinit.inc

@@ -6,11 +6,11 @@
  * Initialization routines.
  *}
 
-function gtk_gl_parse_args(argc: Plongint; argv: PPPChar): gboolean;
+function gtk_gl_parse_args(argc: Plongint; argv: PPPAnsiChar): gboolean;
   cdecl; external GtkGLExtLib;
-function gtk_gl_init_check(argc: Plongint; argv: PPPChar): gboolean;
+function gtk_gl_init_check(argc: Plongint; argv: PPPAnsiChar): gboolean;
   cdecl; external GtkGLExtLib;
-procedure gtk_gl_init(argc: Plongint; argv: PPPChar);
+procedure gtk_gl_init(argc: Plongint; argv: PPPAnsiChar);
   cdecl; external GtkGLExtLib;
 
 {$endif read_interface_rest}

packages/gtk2/src/gtkhtml/htmlparser.inc

@@ -17,7 +17,7 @@
     stream : PHtmlStream;
     xmlctxt : xmlParserCtxtPtr;
     res : longint;
-    chars : array[0..9] of char;
+    chars : array[0..9] of AnsiChar;
     blocking : gboolean;
     blocking_node : PDomNode;
   end;//THtmlParser

packages/gtk2/src/gtkhtml/htmlstream.inc

@@ -21,7 +21,7 @@
     user_data : gpointer;
     cancel_data : gpointer;
     written : gint;
-    mime_type : pchar;
+    mime_type : PAnsiChar;
   end;//THtmlStream
 
   PHtmlStreamClass = ^THtmlStreamClass;
@@ -51,8 +51,8 @@
   function html_stream_get_written(stream:PHtmlStream):gint;cdecl; external gtkhtmllib;
   procedure html_stream_cancel(stream:PHtmlStream);cdecl; external gtkhtmllib;
   procedure html_stream_set_cancel_func(stream:PHtmlStream; abort_func:THtmlStreamCancelFunc; cancel_data:gpointer);cdecl; external gtkhtmllib;
-  function html_stream_get_mime_type(stream:PHtmlStream):pchar;cdecl; external gtkhtmllib;
-  procedure html_stream_set_mime_type(stream:PHtmlStream; mime_type:Pchar);cdecl; external gtkhtmllib;
+  function html_stream_get_mime_type(stream:PHtmlStream):PAnsiChar;cdecl; external gtkhtmllib;
+  procedure html_stream_set_mime_type(stream:PHtmlStream; mime_type:PAnsiChar);cdecl; external gtkhtmllib;
 
 
 {$ENDIF read_interface_rest}

packages/gtk2/src/libglade/glade-xml.inc

@@ -6,7 +6,7 @@ type
    PGladeXML = ^TGladeXML;
    TGladeXML = record
         parent : TGObject;
-        filename : Pchar;
+        filename : PAnsiChar;
         priv : PGladeXMLPrivate;
      end;
 
@@ -30,11 +30,11 @@ function GLADE_IS_XML_CLASS(klass: pointer) : gboolean;
 function GLADE_XML_GET_CLASS(obj: pointer) : PGladeXMLClass;
 
 function glade_xml_get_type:GType; cdecl; external LibGladeLib;
-function glade_xml_new(fname:Pchar; root:Pchar; domain:Pchar):PGladeXML; cdecl; external LibGladeLib;
-function glade_xml_new_from_buffer(buffer:Pchar; size:longint; root:Pchar; domain:Pchar):PGladeXML; cdecl; external LibGladeLib;
-function glade_xml_construct(self:PGladeXML; fname:Pchar; root:Pchar; domain:Pchar):gboolean; cdecl; external LibGladeLib;
-procedure glade_xml_signal_connect(self:PGladeXML; handlername:Pchar; func:TGCallback); cdecl; external LibGladeLib;
-procedure glade_xml_signal_connect_data(self:PGladeXML; handlername:Pchar; func:TGCallback; user_data:gpointer); cdecl; external LibGladeLib;
+function glade_xml_new(fname:PAnsiChar; root:PAnsiChar; domain:PAnsiChar):PGladeXML; cdecl; external LibGladeLib;
+function glade_xml_new_from_buffer(buffer:PAnsiChar; size:longint; root:PAnsiChar; domain:PAnsiChar):PGladeXML; cdecl; external LibGladeLib;
+function glade_xml_construct(self:PGladeXML; fname:PAnsiChar; root:PAnsiChar; domain:PAnsiChar):gboolean; cdecl; external LibGladeLib;
+procedure glade_xml_signal_connect(self:PGladeXML; handlername:PAnsiChar; func:TGCallback); cdecl; external LibGladeLib;
+procedure glade_xml_signal_connect_data(self:PGladeXML; handlername:PAnsiChar; func:TGCallback; user_data:gpointer); cdecl; external LibGladeLib;
 
 {
    use gmodule to connect signals automatically.  Basically a symbol with
@@ -50,11 +50,11 @@ procedure glade_xml_signal_autoconnect(self:PGladeXML); cdecl; external LibGlade
   }
 procedure glade_xml_signal_connect_full(self:PGladeXML; handler_name:Pgchar; func:TGladeXMLConnectFunc; user_data:gpointer); cdecl; external LibGladeLib;
 procedure glade_xml_signal_autoconnect_full(self:PGladeXML; func:TGladeXMLConnectFunc; user_data:gpointer); cdecl; external LibGladeLib;
-function glade_xml_get_widget(self:PGladeXML; name:Pchar):PGtkWidget; cdecl; external LibGladeLib;
-function glade_xml_get_widget_prefix(self:PGladeXML; name:Pchar):PGList; cdecl; external LibGladeLib;
+function glade_xml_get_widget(self:PGladeXML; name:PAnsiChar):PGtkWidget; cdecl; external LibGladeLib;
+function glade_xml_get_widget_prefix(self:PGladeXML; name:PAnsiChar):PGList; cdecl; external LibGladeLib;
 function glade_xml_relative_file(self:PGladeXML; filename:Pgchar):Pgchar; cdecl; external LibGladeLib;
 { don't free the results of these two ...  }
-function glade_get_widget_name(widget:PGtkWidget):Pchar; cdecl; external LibGladeLib;
+function glade_get_widget_name(widget:PGtkWidget):PAnsiChar; cdecl; external LibGladeLib;
 function glade_get_widget_tree(widget:PGtkWidget):PGladeXML; cdecl; external LibGladeLib;
 
 { interface for changing the custom widget handling  }
@@ -65,8 +65,8 @@ type
 procedure glade_set_custom_handler(handler:TGladeXMLCustomWidgetHandler; user_data:gpointer); cdecl; external LibGladeLib;
 
 {$ifndef LIBGLADE_DISABLE_DEPRECATED}
-function glade_xml_new_with_domain(fname:Pchar; root:Pchar; domain:Pchar):PGladeXML;
-function glade_xml_new_from_memory(buffer:Pchar; size:longint; root:Pchar; domain:Pchar):PGladeXML;
+function glade_xml_new_with_domain(fname:PAnsiChar; root:PAnsiChar; domain:PAnsiChar):PGladeXML;
+function glade_xml_new_from_memory(buffer:PAnsiChar; size:longint; root:PAnsiChar; domain:PAnsiChar):PGladeXML;
 {$endif}
 
 // included by libglade.pas

packages/gtk2/src/libglade/libglade2.pas

@@ -84,14 +84,14 @@ end;
 
 // glade-xml.inc ---------------------------------------------------------------
 
-function glade_xml_new_with_domain(fname:Pchar; root:Pchar;
-  domain:Pchar):PGladeXML;
+function glade_xml_new_with_domain(fname:PAnsiChar; root:PAnsiChar;
+  domain:PAnsiChar):PGladeXML;
 begin
   glade_xml_new_with_domain:=glade_xml_new(fname,root,domain);
 end;
 
-function glade_xml_new_from_memory(buffer:Pchar; size:longint; root:Pchar;
-  domain:Pchar):PGladeXML;
+function glade_xml_new_from_memory(buffer:PAnsiChar; size:longint; root:PAnsiChar;
+  domain:PAnsiChar):PGladeXML;
 begin
   glade_xml_new_from_memory:=glade_xml_new_from_buffer(buffer,size,root,domain);
 end;

packages/gtk2/src/pango/pango-attributes.inc

@@ -33,7 +33,7 @@
    PPangoAttrString = ^TPangoAttrString;
    TPangoAttrString = record
         attr : TPangoAttribute;
-        value : Pchar;
+        value : PAnsiChar;
      end;
 
    PPangoAttrLanguage = ^TPangoAttrLanguage;
@@ -105,7 +105,7 @@ function PANGO_TYPE_COLOR : GType;
 function pango_color_get_type:GType; cdecl; external pangolib;
 function pango_color_copy(src:PPangoColor):PPangoColor; cdecl; external pangolib;
 procedure pango_color_free(color:PPangoColor); cdecl; external pangolib;
-function pango_color_parse(color:PPangoColor; spec:Pchar):gboolean; cdecl; external pangolib;
+function pango_color_parse(color:PPangoColor; spec:PAnsiChar):gboolean; cdecl; external pangolib;
 
 { Attributes  }
 
@@ -116,7 +116,7 @@ function pango_attribute_copy(attr:PPangoAttribute):PPangoAttribute; cdecl; exte
 procedure pango_attribute_destroy(attr:PPangoAttribute); cdecl; external pangolib;
 function pango_attribute_equal(attr1:PPangoAttribute; attr2:PPangoAttribute):gboolean; cdecl; external pangolib;
 function pango_attr_language_new(language:PPangoLanguage):PPangoAttribute; cdecl; external pangolib;
-function pango_attr_family_new(family:Pchar):PPangoAttribute; cdecl; external pangolib;
+function pango_attr_family_new(family:PAnsiChar):PPangoAttribute; cdecl; external pangolib;
 function pango_attr_foreground_new(red:guint16; green:guint16; blue:guint16):PPangoAttribute; cdecl; external pangolib;
 function pango_attr_background_new(red:guint16; green:guint16; blue:guint16):PPangoAttribute; cdecl; external pangolib;
 function pango_attr_size_new(size:longint):PPangoAttribute; cdecl; external pangolib;
@@ -146,7 +146,7 @@ function pango_attr_iterator_copy(iterator:PPangoAttrIterator):PPangoAttrIterato
 procedure pango_attr_iterator_destroy(iterator:PPangoAttrIterator); cdecl; external pangolib;
 function pango_attr_iterator_get(iterator:PPangoAttrIterator; _type:TPangoAttrType):PPangoAttribute; cdecl; external pangolib;
 procedure pango_attr_iterator_get_font(iterator:PPangoAttrIterator; desc:PPangoFontDescription; var language:PPangoLanguage; extra_attrs:PPGSList); cdecl; external pangolib;
-function pango_parse_markup(markup_text:Pchar; length:longint; accel_marker:gunichar; var attr_list:PPangoAttrList; text:PPchar;
+function pango_parse_markup(markup_text:PAnsiChar; length:longint; accel_marker:gunichar; var attr_list:PPangoAttrList; text:PPAnsiChar;
            accel_char:Pgunichar; error:PPGError):gboolean; cdecl; external pangolib;
 {$endif read_interface_functions}
 

packages/gtk2/src/pango/pango-break.inc

@@ -5,7 +5,7 @@
   }
 { Can break line in front of character  }
 { Must break line in front of character  }
-{ Can break here when doing char wrap  }
+{ Can break here when doing AnsiChar wrap  }
 { Whitespace character  }
 { cursor can appear in front of character (i.e. this is a grapheme
      boundary, or the first character in the text)
@@ -15,7 +15,7 @@
      the next sentence starts right away)
     }
 { first character in a word  }
-{ is first non-word char after a word  }
+{ is first non-word AnsiChar after a word  }
 { There are two ways to divide sentences. The first assigns all
      intersentence whitespace/control/format chars to some sentence,
      so all chars are in some sentence; is_sentence_boundary denotes
@@ -25,7 +25,7 @@
      sentences.
     }
 { first character in a sentence  }
-{ first non-sentence char after a sentence  }
+{ first non-sentence AnsiChar after a sentence  }
    PPangoLogAttr = ^TPangoLogAttr;
    TPangoLogAttr = record
         flag0 : word;
@@ -83,7 +83,7 @@ procedure set_is_sentence_end(var a : TPangoLogAttr; __is_sentence_end : guint);
 
 procedure pango_break(text:Pgchar; length:longint; analysis:PPangoAnalysis; attrs:PPangoLogAttr; attrs_len:longint); cdecl; external pangolib;
 procedure pango_find_paragraph_boundary(text:Pgchar; length:gint; paragraph_delimiter_index:Pgint; next_paragraph_start:Pgint); cdecl; external pangolib;
-procedure pango_get_log_attrs(text:Pchar; length:longint; level:longint; language:PPangoLanguage; log_attrs:PPangoLogAttr;
+procedure pango_get_log_attrs(text:PAnsiChar; length:longint; level:longint; language:PPangoLanguage; log_attrs:PPangoLogAttr;
             attrs_len:longint); cdecl; external pangolib;
 {$ifdef PANGO_ENABLE_ENGINE}
 { This is the default break algorithm, used if no language

packages/gtk2/src/pango/pango-context.inc

@@ -45,7 +45,7 @@ function pango_context_get_base_dir(context:PPangoContext):TPangoDirection; cdec
    consistent shaping/language engine and bidrectional level.
    Returns a GList of PangoItem's
   }
-function pango_itemize(context:PPangoContext; text:Pchar; start_index:longint; length:longint; attrs:PPangoAttrList;
+function pango_itemize(context:PPangoContext; text:PAnsiChar; start_index:longint; length:longint; attrs:PPangoAttrList;
            cached_iter:PPangoAttrIterator):PGList; cdecl; external pangolib;
 
 

packages/gtk2/src/pango/pango-engine.inc

@@ -27,7 +27,7 @@
      end;
 
    TPangoEngineLangScriptBreak =
-     procedure (text:Pchar; len:longint; analysis:PPangoAnalysis;
+     procedure (text:PAnsiChar; len:longint; analysis:PPangoAnalysis;
                 attrs:PPangoLogAttr; attrs_len:longint); cdecl;
 
    PPangoEngineLang = ^TPangoEngineLang;
@@ -37,7 +37,7 @@
      end;
 
    TPangoEngineShapeScript =
-     procedure (font:PPangoFont; text:Pchar; length:longint;
+     procedure (font:PPangoFont; text:PAnsiChar; length:longint;
                 analysis:PPangoAnalysis; glyphs:PPangoGlyphString); cdecl;
    TPangoEngineShapeGetCoverage =
      function (font:PPangoFont; language:PPangoLanguage):PPangoCoverage; cdecl;
@@ -65,7 +65,7 @@ const
 
 { A module should export the following functions  }
 procedure script_engine_list(var engines:PPangoEngineInfo; n_engines:Plongint); cdecl; external pangolib;
-function script_engine_load(id:Pchar):PPangoEngine; cdecl; external pangolib;
+function script_engine_load(id:PAnsiChar):PPangoEngine; cdecl; external pangolib;
 procedure script_engine_unload(engine:PPangoEngine); cdecl; external pangolib;
 {$endif}
 { PANGO_ENABLE_ENGINE  }

packages/gtk2/src/pango/pango-font.inc

@@ -55,7 +55,7 @@
      procedure (family:PPangoFontFamily; faces:PPPPangoFontFace;
                                 n_faces:Plongint); cdecl;
    TPangoFontFamilyClassGetName =
-     function (family:PPangoFontFamily):Pchar; cdecl;
+     function (family:PPangoFontFamily):PAnsiChar; cdecl;
 
    PPangoFontFamilyClass = ^TPangoFontFamilyClass;
    TPangoFontFamilyClass = record
@@ -72,7 +72,7 @@
    PPangoFontFaceClass = ^TPangoFontFaceClass;
    TPangoFontFaceClass = record
         parent_class : TGObjectClass;
-        get_face_name : function (face:PPangoFontFace):Pchar; cdecl;
+        get_face_name : function (face:PPangoFontFace):PAnsiChar; cdecl;
         describe : function (face:PPangoFontFace):PPangoFontDescription; cdecl;
         _pango_reserved1 : procedure ; cdecl;
         _pango_reserved2 : procedure ; cdecl;
@@ -179,9 +179,9 @@ function pango_font_description_hash(desc:PPangoFontDescription):guint; cdecl; e
 function pango_font_description_equal(desc1:PPangoFontDescription; desc2:PPangoFontDescription):gboolean; cdecl; external pangolib;
 procedure pango_font_description_free(desc:PPangoFontDescription); cdecl; external pangolib;
 procedure pango_font_descriptions_free(var descs:PPangoFontDescription; n_descs:longint); cdecl; external pangolib;
-procedure pango_font_description_set_family(desc:PPangoFontDescription; family:Pchar); cdecl; external pangolib;
-procedure pango_font_description_set_family_static(desc:PPangoFontDescription; family:Pchar); cdecl; external pangolib;
-function pango_font_description_get_family(desc:PPangoFontDescription):Pchar; cdecl; external pangolib;
+procedure pango_font_description_set_family(desc:PPangoFontDescription; family:PAnsiChar); cdecl; external pangolib;
+procedure pango_font_description_set_family_static(desc:PPangoFontDescription; family:PAnsiChar); cdecl; external pangolib;
+function pango_font_description_get_family(desc:PPangoFontDescription):PAnsiChar; cdecl; external pangolib;
 procedure pango_font_description_set_style(desc:PPangoFontDescription; style:TPangoStyle); cdecl; external pangolib;
 function pango_font_description_get_style(desc:PPangoFontDescription):TPangoStyle; cdecl; external pangolib;
 procedure pango_font_description_set_variant(desc:PPangoFontDescription; variant:TPangoVariant); cdecl; external pangolib;
@@ -199,9 +199,9 @@ procedure pango_font_description_unset_fields(desc:PPangoFontDescription; to_uns
 procedure pango_font_description_merge(desc:PPangoFontDescription; desc_to_merge:PPangoFontDescription; replace_existing:gboolean); cdecl; external pangolib;
 procedure pango_font_description_merge_static(desc:PPangoFontDescription; desc_to_merge:PPangoFontDescription; replace_existing:gboolean); cdecl; external pangolib;
 function pango_font_description_better_match(desc:PPangoFontDescription; old_match:PPangoFontDescription; new_match:PPangoFontDescription):gboolean; cdecl; external pangolib;
-function pango_font_description_from_string(str:Pchar):PPangoFontDescription; cdecl; external pangolib;
-function pango_font_description_to_string(desc:PPangoFontDescription):Pchar; cdecl; external pangolib;
-function pango_font_description_to_filename(desc:PPangoFontDescription):Pchar; cdecl; external pangolib;
+function pango_font_description_from_string(str:PAnsiChar):PPangoFontDescription; cdecl; external pangolib;
+function pango_font_description_to_string(desc:PPangoFontDescription):PAnsiChar; cdecl; external pangolib;
+function pango_font_description_to_filename(desc:PPangoFontDescription):PAnsiChar; cdecl; external pangolib;
 {
    PangoFontMetrics
 }
@@ -232,7 +232,7 @@ function PANGO_IS_FONT_FAMILY(anObject : Pointer) : boolean;
 function pango_font_family_get_type:GType; cdecl; external pangolib;
 procedure pango_font_family_list_faces(family:PPangoFontFamily;
                      faces:PPPPangoFontFace; n_faces:Plongint); cdecl; external pangolib;
-function pango_font_family_get_name(family:PPangoFontFamily):Pchar; cdecl; external pangolib;
+function pango_font_family_get_name(family:PPangoFontFamily):PAnsiChar; cdecl; external pangolib;
 function pango_font_family_is_monospace(family:PPangoFontFamily):gboolean; cdecl; external pangolib;
 
 {$ifdef PANGO_ENABLE_BACKEND}
@@ -252,7 +252,7 @@ function PANGO_IS_FONT_FACE(anObject : pointer) : boolean;
 
 function pango_font_face_get_type:GType; cdecl; external pangolib;
 function pango_font_face_describe(face:PPangoFontFace):PPangoFontDescription; cdecl; external pangolib;
-function pango_font_face_get_face_name(face:PPangoFontFace):Pchar; cdecl; external pangolib;
+function pango_font_face_get_face_name(face:PPangoFontFace):PAnsiChar; cdecl; external pangolib;
 {$ifdef PANGO_ENABLE_BACKEND}
 function PANGO_FONT_FACE_CLASS(klass : pointer) : PPangoFontFaceClass;
 function PANGO_IS_FONT_FACE_CLASS(klass : pointer) : boolean;

packages/gtk2/src/pango/pango-glyph-item.inc

@@ -32,18 +32,18 @@ end;
 function PANGO_TYPE_GLYPH_ITEM : GType;
   
 function pango_glyph_item_get_type():GType;cdecl;external pangolib;
-function pango_glyph_item_split(orig:PPangoGlyphItem; text:Pchar; split_index:longint):PPangoGlyphItem;cdecl;external pangolib;
+function pango_glyph_item_split(orig:PPangoGlyphItem; text:PAnsiChar; split_index:longint):PPangoGlyphItem;cdecl;external pangolib;
 function pango_glyph_item_copy(orig:PPangoGlyphItem):PPangoGlyphItem;cdecl;external pangolib;
 procedure pango_glyph_item_free(glyph_item:PPangoGlyphItem);cdecl;external pangolib;
-function pango_glyph_item_apply_attrs(glyph_item:PPangoGlyphItem; text:Pchar; list:PPangoAttrList):PGSList;cdecl;external pangolib;
-procedure pango_glyph_item_letter_space(glyph_item:PPangoGlyphItem; text:Pchar; log_attrs:PPangoLogAttr; letter_spacing:longint);cdecl;external pangolib;
+function pango_glyph_item_apply_attrs(glyph_item:PPangoGlyphItem; text:PAnsiChar; list:PPangoAttrList):PGSList;cdecl;external pangolib;
+procedure pango_glyph_item_letter_space(glyph_item:PPangoGlyphItem; text:PAnsiChar; log_attrs:PPangoLogAttr; letter_spacing:longint);cdecl;external pangolib;
 
 function PANGO_TYPE_GLYPH_ITEM_ITER : GType;
 function pango_glyph_item_iter_get_type():GType;cdecl;external pangolib;
 function pango_glyph_item_iter_copy(orig:PPangoGlyphItemIter):PPangoGlyphItemIter;cdecl;external pangolib;
 procedure pango_glyph_item_iter_free(iter:PPangoGlyphItemIter);cdecl;external pangolib;
-function pango_glyph_item_iter_init_start(iter:PPangoGlyphItemIter; glyph_item:PPangoGlyphItem; text:Pchar):gboolean;cdecl;external pangolib;
-function pango_glyph_item_iter_init_end(iter:PPangoGlyphItemIter; glyph_item:PPangoGlyphItem; text:Pchar):gboolean;cdecl;external pangolib;
+function pango_glyph_item_iter_init_start(iter:PPangoGlyphItemIter; glyph_item:PPangoGlyphItem; text:PAnsiChar):gboolean;cdecl;external pangolib;
+function pango_glyph_item_iter_init_end(iter:PPangoGlyphItemIter; glyph_item:PPangoGlyphItem; text:PAnsiChar):gboolean;cdecl;external pangolib;
 function pango_glyph_item_iter_next_cluster(iter:PPangoGlyphItemIter):gboolean;cdecl;external pangolib;
 function pango_glyph_item_iter_prev_cluster(iter:PPangoGlyphItemIter):gboolean;cdecl;external pangolib;
 

packages/gtk2/src/pango/pango-glyph.inc

@@ -69,10 +69,10 @@ procedure pango_glyph_string_free(_string:PPangoGlyphString); cdecl; external pa
 procedure pango_glyph_string_extents(glyphs:PPangoGlyphString; font:PPangoFont; ink_rect:PPangoRectangle; logical_rect:PPangoRectangle); cdecl; external pangolib;
 procedure pango_glyph_string_extents_range(glyphs:PPangoGlyphString; start:longint; theEnd:longint; font:PPangoFont; ink_rect:PPangoRectangle;
             logical_rect:PPangoRectangle); cdecl; external pangolib;
-procedure pango_glyph_string_get_logical_widths(glyphs:PPangoGlyphString; text:Pchar; length:longint; embedding_level:longint; logical_widths:Plongint); cdecl; external pangolib;
-procedure pango_glyph_string_index_to_x(glyphs:PPangoGlyphString; text:Pchar; length:longint; analysis:PPangoAnalysis; index:longint;
+procedure pango_glyph_string_get_logical_widths(glyphs:PPangoGlyphString; text:PAnsiChar; length:longint; embedding_level:longint; logical_widths:Plongint); cdecl; external pangolib;
+procedure pango_glyph_string_index_to_x(glyphs:PPangoGlyphString; text:PAnsiChar; length:longint; analysis:PPangoAnalysis; index:longint;
             trailing:gboolean; x_pos:Plongint); cdecl; external pangolib;
-procedure pango_glyph_string_x_to_index(glyphs:PPangoGlyphString; text:Pchar; length:longint; analysis:PPangoAnalysis; x_pos:longint;
+procedure pango_glyph_string_x_to_index(glyphs:PPangoGlyphString; text:PAnsiChar; length:longint; analysis:PPangoAnalysis; x_pos:longint;
             index:Plongint; trailing:Plongint); cdecl; external pangolib;
 { Turn a string of characters into a string of glyphs
   }

packages/gtk2/src/pango/pango-layout.inc

@@ -58,10 +58,10 @@ function pango_layout_copy(src:PPangoLayout):PPangoLayout; cdecl; external pango
 function pango_layout_get_context(layout:PPangoLayout):PPangoContext; cdecl; external pangolib;
 procedure pango_layout_set_attributes(layout:PPangoLayout; attrs:PPangoAttrList); cdecl; external pangolib;
 function pango_layout_get_attributes(layout:PPangoLayout):PPangoAttrList; cdecl; external pangolib;
-procedure pango_layout_set_text(layout:PPangoLayout; text:Pchar; length:longint); cdecl; external pangolib;
-function pango_layout_get_text(layout:PPangoLayout):Pchar; cdecl; external pangolib;
-procedure pango_layout_set_markup(layout:PPangoLayout; markup:Pchar; length:longint); cdecl; external pangolib;
-procedure pango_layout_set_markup_with_accel(layout:PPangoLayout; markup:Pchar; length:longint; accel_marker:gunichar; accel_char:Pgunichar); cdecl; external pangolib;
+procedure pango_layout_set_text(layout:PPangoLayout; text:PAnsiChar; length:longint); cdecl; external pangolib;
+function pango_layout_get_text(layout:PPangoLayout):PAnsiChar; cdecl; external pangolib;
+procedure pango_layout_set_markup(layout:PPangoLayout; markup:PAnsiChar; length:longint); cdecl; external pangolib;
+procedure pango_layout_set_markup_with_accel(layout:PPangoLayout; markup:PAnsiChar; length:longint; accel_marker:gunichar; accel_char:Pgunichar); cdecl; external pangolib;
 function pango_layout_get_font_description(layout:PPangoLayout):PPangoFontDescription; cdecl; external pangolib;
 procedure pango_layout_set_font_description(layout:PPangoLayout; desc:PPangoFontDescription); cdecl; external pangolib;
 procedure pango_layout_set_width(layout:PPangoLayout; width:longint); cdecl; external pangolib;

packages/gtk2/src/pango/pango-types.inc

@@ -48,10 +48,10 @@ function PANGO_RBEARING(rect : TPangoRectangle) : longint;
 }
 function PANGO_TYPE_LANGUAGE : GType;
 function pango_language_get_type:GType; cdecl; external pangolib;
-function pango_language_from_string(language:Pchar):PPangoLanguage; cdecl; external pangolib;
-function pango_language_to_string(language : PPangoLanguage) : Pchar;
+function pango_language_from_string(language:PAnsiChar):PPangoLanguage; cdecl; external pangolib;
+function pango_language_to_string(language : PPangoLanguage) : PAnsiChar;
 
-function pango_language_matches(language:PPangoLanguage; range_list:Pchar):gboolean; cdecl; external pangolib;
+function pango_language_matches(language:PPangoLanguage; range_list:PAnsiChar):gboolean; cdecl; external pangolib;
 {$endif read_interface_funtions}
 
 //------------------------------------------------------------------------------
@@ -82,9 +82,9 @@ begin
   PANGO_TYPE_LANGUAGE:=pango_language_get_type;
 end;
 
-function pango_language_to_string(language : PPangoLanguage) : Pchar;
+function pango_language_to_string(language : PPangoLanguage) : PAnsiChar;
 begin
-  pango_language_to_string:=Pchar(language);
+  pango_language_to_string:=PAnsiChar(language);
 end;
 
 function PANGO_PIXELS(d: integer): integer;

packages/gtk2/src/pango/pangoutils.pas

@@ -52,17 +52,17 @@ Type
   {$WARNINGS OFF}
 {$ENDIF}
 
-function pango_split_file_list(str:Pchar):PPchar; cdecl; external pangolib;
-function pango_trim_string(str:Pchar):Pchar; cdecl; external pangolib;
+function pango_split_file_list(str:PAnsiChar):PPAnsiChar; cdecl; external pangolib;
+function pango_trim_string(str:PAnsiChar):PAnsiChar; cdecl; external pangolib;
 function pango_read_line(stream:PFILE; str:PGString):gint; cdecl; external pangolib;
-function pango_skip_space(pos:PPchar):gboolean; cdecl; external pangolib;
-function pango_scan_word(pos:PPchar; OutStr:PGString):gboolean; cdecl; external pangolib;
-function pango_scan_string(pos:PPchar; OutStr:PGString):gboolean; cdecl; external pangolib;
-function pango_scan_int(pos:PPchar; OutInt:Plongint):gboolean; cdecl; external pangolib;
+function pango_skip_space(pos:PPAnsiChar):gboolean; cdecl; external pangolib;
+function pango_scan_word(pos:PPAnsiChar; OutStr:PGString):gboolean; cdecl; external pangolib;
+function pango_scan_string(pos:PPAnsiChar; OutStr:PGString):gboolean; cdecl; external pangolib;
+function pango_scan_int(pos:PPAnsiChar; OutInt:Plongint):gboolean; cdecl; external pangolib;
 
 {$ifdef PANGO_ENABLE_BACKEND}
-function pango_config_key_get(key:Pchar):Pchar; cdecl; external pangolib;
-procedure pango_lookup_aliases(fontname:Pchar; families:PPPchar; n_families:Plongint); cdecl; external pangolib;
+function pango_config_key_get(key:PAnsiChar):PAnsiChar; cdecl; external pangolib;
+procedure pango_lookup_aliases(fontname:PAnsiChar; families:PPPAnsiChar; n_families:Plongint); cdecl; external pangolib;
 {$endif}
 { PANGO_ENABLE_BACKEND  }
 
@@ -73,10 +73,10 @@ procedure pango_lookup_aliases(fontname:Pchar; families:PPPchar; n_families:Plon
    a warning is printed (with g_warning) if the string does not
    contain a valid value.
   }
-function pango_parse_style(str:Pchar; style:PPangoStyle; warn:gboolean):gboolean; cdecl; external pangolib;
-function pango_parse_variant(str:Pchar; variant:PPangoVariant; warn:gboolean):gboolean; cdecl; external pangolib;
-function pango_parse_weight(str:Pchar; weight:PPangoWeight; warn:gboolean):gboolean; cdecl; external pangolib;
-function pango_parse_stretch(str:Pchar; stretch:PPangoStretch; warn:gboolean):gboolean; cdecl; external pangolib;
+function pango_parse_style(str:PAnsiChar; style:PPangoStyle; warn:gboolean):gboolean; cdecl; external pangolib;
+function pango_parse_variant(str:PAnsiChar; variant:PPangoVariant; warn:gboolean):gboolean; cdecl; external pangolib;
+function pango_parse_weight(str:PAnsiChar; weight:PPangoWeight; warn:gboolean):gboolean; cdecl; external pangolib;
+function pango_parse_stretch(str:PAnsiChar; stretch:PPangoStretch; warn:gboolean):gboolean; cdecl; external pangolib;
 {$ifdef PANGO_ENABLE_BACKEND}
 
 { On Unix, return the name of the "pango" subdirectory of SYSCONFDIR
@@ -85,13 +85,13 @@ function pango_parse_stretch(str:Pchar; stretch:PPangoStretch; warn:gboolean):gb
    stored in the registry). The returned string should not be
    g_free'd.
   }
-function pango_get_sysconf_subdirectory:Pchar; cdecl; external pangolib;
+function pango_get_sysconf_subdirectory:PAnsiChar; cdecl; external pangolib;
 
 { Ditto for LIBDIR/pango. On Win32, use the same Pango
    installation directory. This returned string should not be
    g_free'd either.
   }
-function pango_get_lib_subdirectory:Pchar; cdecl; external pangolib;
+function pango_get_lib_subdirectory:PAnsiChar; cdecl; external pangolib;
 {$endif}
 { PANGO_ENABLE_BACKEND  }
 
@@ -103,7 +103,7 @@ function pango_log2vis_get_embedding_levels(str:Pgunichar; len:longint; pbase_di
 function pango_unichar_direction(ch : gunichar) : TPangoDirection; cdecl; external pangolib;
 function pango_find_base_dir(text : Pgchar; aLength : gint) : TPangoDirection; cdecl; external pangolib;
 function pango_get_mirror_char(ch:gunichar; mirrored_ch:Pgunichar):gboolean; cdecl; external pangolib;
-function pango_language_get_sample_string(language:PPangoLanguage):Pchar; cdecl; external pangolib;
+function pango_language_get_sample_string(language:PPangoLanguage):PAnsiChar; cdecl; external pangolib;
 
 implementation
 

packages/gtk2/src/pangocairo/pangocairo.pas

@@ -111,7 +111,7 @@ procedure pango_cairo_error_underline_path(cr:Pcairo_t; x:double; y:double; widt
 {$ifdef HasPango1_22}
 procedure pango_cairo_font_map_set_default(fontmap:PPangoCairoFontMap);cdecl;external pangocairolib;
 function pango_cairo_create_context(cr:Pcairo_t):PPangoContext;cdecl;external pangocairolib;
-procedure pango_cairo_show_glyph_item(cr:Pcairo_t; text:Pchar; glyph_item:PPangoGlyphItem);cdecl;external pangocairolib;
+procedure pango_cairo_show_glyph_item(cr:Pcairo_t; text:PAnsiChar; glyph_item:PPangoGlyphItem);cdecl;external pangocairolib;
 {$endif}
 
 implementation