瀏覽代碼

* Forgot to commit pango-layout.inc
* Further patches from Paul Ishenin
- one error in gdk (translation was correct, but error is placed in the gdkpango.h)
- and ocasionally missed 3 functions and one constant.

git-svn-id: trunk@11620 -

michael 17 年之前
父節點
當前提交
4476673fc0

+ 2 - 2
packages/gtk2/src/gtk+/gdk/gdkpango.inc

@@ -74,8 +74,8 @@ function GDK_IS_PANGO_RENDERER_CLASS(klass: pointer): boolean;
 function GDK_PANGO_RENDERER_GET_CLASS(obj: pointer): PGdkPangoRendererClass;
 
 function gdk_pango_renderer_get_type: GType; cdecl; external gdklib;
-function gdk_pango_renderer_new(screen:PGdkScreen):PPangoRenderer; cdecl; external gdklib;
-function gdk_pango_renderer_get_default(screen:PGdkScreen):PPangoRenderer; cdecl; external gdklib;
+function gdk_pango_renderer_new(screen:PGdkScreen):PGdkPangoRenderer; cdecl; external gdklib;
+function gdk_pango_renderer_get_default(screen:PGdkScreen):PGdkPangoRenderer; cdecl; external gdklib;
 procedure gdk_pango_renderer_set_drawable(gdk_renderer:PGdkPangoRenderer; drawable:PGdkDrawable); cdecl; external gdklib;
 procedure gdk_pango_renderer_set_gc(gdk_renderer:PGdkPangoRenderer; gc:PGdkGC); cdecl; external gdklib;
 procedure gdk_pango_renderer_set_stipple(gdk_renderer:PGdkPangoRenderer; part:TPangoRenderPart; stipple:PGdkBitmap); cdecl; external gdklib;

+ 1 - 0
packages/gtk2/src/gtk+/gdk/gdkscreen.inc

@@ -43,6 +43,7 @@ function GDK_SCREEN_GET_CLASS(obj : Pointer) : PGdkScreenClass;
 
 
 //function gdk_screen_get_type:GType; cdecl; external gdklib;
+function gdk_screen_get_default:PGdkScreen; cdecl; external gdklib;
 function gdk_screen_get_default_colormap(screen:PGdkScreen):PGdkColormap; cdecl; external gdklib;
 procedure gdk_screen_set_default_colormap(screen:PGdkScreen; colormap:PGdkColormap); cdecl; external gdklib;
 function gdk_screen_get_system_colormap(screen:PGdkScreen):PGdkColormap; cdecl; external gdklib;

+ 1 - 1
packages/gtk2/src/gtk+/gtk/gtkcellrenderer.inc

@@ -59,7 +59,7 @@ const
    GTK_CELL_RENDERER_PRELIT = 1 shl 1;
    GTK_CELL_RENDERER_INSENSITIVE = 1 shl 2;
    GTK_CELL_RENDERER_SORTED = 1 shl 3;
-
+   GTK_CELL_RENDERER_FOCUSED = 1 shl 4;
 
 const
    bm_TGtkCellRenderer_mode = $3;

+ 5 - 0
packages/gtk2/src/gtk+/gtk/gtkfilechooser.inc

@@ -112,6 +112,11 @@ function gtk_file_chooser_add_shortcut_folder_uri(chooser:PGtkFileChooser; uri:P
 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_list_shortcut_folder_uris(chooser:PGtkFileChooser):PGSList;cdecl;external gtklib name 'gtk_file_chooser_list_shortcut_folder_uris';
 
+{$ifdef HasGTK2_6}
+procedure gtk_file_chooser_set_show_hidden(chooser:PGtkFileChooser; show_hidden:gboolean);cdecl;external gtklib;
+function gtk_file_chooser_get_show_hidden(chooser:PGtkFileChooser):gboolean;cdecl;external gtklib;
+{$endif}
+
 {$ifdef HasGTK2_8}
 function gtk_file_chooser_get_do_overwrite_confirmation(chooser:PGtkFileChooser): gboolean;  cdecl; external gtklib name 'gtk_file_chooser_get_do_overwrite_confirmation';
 procedure gtk_file_chooser_set_do_overwrite_confirmation(chooser:PGtkFileChooser; do_overwrite_confirmation:gboolean);  cdecl; external gtklib name 'gtk_file_chooser_set_do_overwrite_confirmation';

+ 13 - 1
packages/gtk2/src/pango/pango-layout.inc

@@ -8,7 +8,19 @@
    );
 
    PPangoWrapMode = ^TPangoWrapMode;
-   TPangoWrapMode = (PANGO_WRAP_WORD,PANGO_WRAP_CHAR);
+   TPangoWrapMode = (
+     PANGO_WRAP_WORD,
+     PANGO_WRAP_CHAR,
+     PANGO_WRAP_WORD_CHAR 
+   );
+
+   PPangoEllipsizeMode = ^TPangoEllipsizeMode;
+   TPangoEllipsizeMode = (
+     PANGO_ELLIPSIZE_NONE,
+     PANGO_ELLIPSIZE_START,
+     PANGO_ELLIPSIZE_MIDDLE,
+     PANGO_ELLIPSIZE_END
+   );
 
    { start of line as byte index into layout->text  }
    { length of line in bytes  }