Browse Source

* apply patch from Paul Ishenin which adds missing gdk2.6 symbols

git-svn-id: trunk@11570 -
Almindor 17 years ago
parent
commit
5298b2b567

+ 5 - 0
packages/gtk2/src/gtk+/gdk/gdkdisplay.inc

@@ -92,6 +92,11 @@ function gdk_display_get_default_group(display: PGdkDisplay): PGdkWindow; cdecl;
 procedure gdk_display_set_double_click_distance(display: PGdkDisplay; distance: guint); cdecl; external gdklib;
 procedure gdk_display_set_double_click_distance(display: PGdkDisplay; distance: guint); cdecl; external gdklib;
 function gdk_display_supports_cursor_alpha(display: PGdkDisplay): gboolean; cdecl; external gdklib;
 function gdk_display_supports_cursor_alpha(display: PGdkDisplay): gboolean; cdecl; external gdklib;
 function gdk_display_supports_cursor_color(display: PGdkDisplay): gboolean; cdecl; external gdklib;
 function gdk_display_supports_cursor_color(display: PGdkDisplay): gboolean; cdecl; external gdklib;
+// 2.6
+function gdk_display_request_selection_notification(display: PGdkDisplay; selection: TGdkAtom): gboolean; cdecl; external gdklib;
+procedure gdk_display_store_clipboard(display: PGdkDisplay; clipboard_window: PGdkWindow; time_: guint32; targets: PGdkAtom; n_targets: gint); cdecl; external gdklib;
+function gdk_display_supports_clipboard_persistence(display: PGdkDisplay): gboolean; cdecl; external gdklib;
+function gdk_display_supports_selection_notification(display: PGdkDisplay): gboolean; cdecl; external gdklib;
 {$endif read_interface_rest}
 {$endif read_interface_rest}
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------

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

@@ -77,6 +77,7 @@ procedure gdk_drag_context_unref(context:PGdkDragContext); cdecl; external gdkli
 { Destination side  }
 { Destination side  }
 
 
 procedure gdk_drag_status(context:PGdkDragContext; action:TGdkDragAction; time:guint32); cdecl; external gdklib;
 procedure gdk_drag_status(context:PGdkDragContext; action:TGdkDragAction; time:guint32); cdecl; external gdklib;
+function gdk_drag_drop_succeeded(context:PGdkDragContext):gboolean; cdecl; external gdklib;
 procedure gdk_drop_reply(context:PGdkDragContext; ok:gboolean; time:guint32); cdecl; external gdklib;
 procedure gdk_drop_reply(context:PGdkDragContext; ok:gboolean; time:guint32); cdecl; external gdklib;
 procedure gdk_drop_finish(context:PGdkDragContext; success:gboolean; time:guint32); cdecl; external gdklib;
 procedure gdk_drop_finish(context:PGdkDragContext; success:gboolean; time:guint32); cdecl; external gdklib;
 function gdk_drag_get_selection(context:PGdkDragContext):TGdkAtom; cdecl; external gdklib;
 function gdk_drag_get_selection(context:PGdkDragContext):TGdkAtom; cdecl; external gdklib;

+ 13 - 0
packages/gtk2/src/gtk+/gdk/gdkdrawable.inc

@@ -76,6 +76,16 @@
         _gdk_reserved15 : procedure ; cdecl;
         _gdk_reserved15 : procedure ; cdecl;
         _gdk_reserved16 : procedure ; cdecl;
         _gdk_reserved16 : procedure ; cdecl;
      end;
      end;
+    
+   PGdkTrapezoid = ^TGdkTrapezoid;
+   TGdkTrapezoid = record
+        y1 : double;
+        x11 : double;
+        x21 : double;
+        y2 : double;
+        x12 : double;
+        x22 : double;
+     end;
 
 
 {$ENDIF read_interface_types}
 {$ENDIF read_interface_types}
 
 
@@ -125,6 +135,7 @@ procedure gdk_draw_rectangle(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; x:gi
 procedure gdk_draw_arc(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; x:gint; y:gint;
 procedure gdk_draw_arc(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; x:gint; y:gint;
             width:gint; height:gint; angle1:gint; angle2:gint); cdecl; external gdklib;
             width:gint; height:gint; angle1:gint; angle2:gint); cdecl; external gdklib;
 procedure gdk_draw_polygon(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; points:PGdkPoint; npoints:gint); cdecl; external gdklib;
 procedure gdk_draw_polygon(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; points:PGdkPoint; npoints:gint); cdecl; external gdklib;
+procedure gdk_draw_trapezoids(drawable:PGdkDrawable; gc:PGdkGC; trapezoids: PGdkTrapezoid; n_trapezoids: gint); cdecl; external gdklib;
 procedure gdk_draw_pixbuf(drawable: PGdkDrawable; gc:PGdkGC; src:PGdkPixbuf;
 procedure gdk_draw_pixbuf(drawable: PGdkDrawable; gc:PGdkGC; src:PGdkPixbuf;
             xsrc:gint; ysrc:gint; xdest:gint; ydest:gint;
             xsrc:gint; ysrc:gint; xdest:gint; ydest:gint;
             width:gint; height:gint; dither:TGdkRgbDither;
             width:gint; height:gint; dither:TGdkRgbDither;
@@ -152,6 +163,8 @@ procedure gdk_draw_segments(drawable:PGdkDrawable; gc:PGdkGC; segs:PGdkSegment;
 procedure gdk_draw_lines(drawable:PGdkDrawable; gc:PGdkGC; points:PGdkPoint; npoints:gint); cdecl; external gdklib;
 procedure gdk_draw_lines(drawable:PGdkDrawable; gc:PGdkGC; points:PGdkPoint; npoints:gint); cdecl; external gdklib;
 procedure gdk_draw_glyphs(drawable:PGdkDrawable; gc:PGdkGC; font:PPangoFont; x:gint; y:gint;
 procedure gdk_draw_glyphs(drawable:PGdkDrawable; gc:PGdkGC; font:PPangoFont; x:gint; y:gint;
             glyphs:PPangoGlyphString); cdecl; external gdklib;
             glyphs:PPangoGlyphString); cdecl; external gdklib;
+procedure gdk_draw_glyphs_transformed(drawable:PGdkDrawable; gc:PGdkGC; matrix: PPangoMatrix; font: PPangoFont;
+            x: gint; y: gint; glyphs: PPangoGlyphString); cdecl; external gdklib;
 procedure gdk_draw_layout_line(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; line:PPangoLayoutLine); cdecl; external gdklib;
 procedure gdk_draw_layout_line(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; line:PPangoLayoutLine); cdecl; external gdklib;
 procedure gdk_draw_layout(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; layout:PPangoLayout); cdecl; external gdklib;
 procedure gdk_draw_layout(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; layout:PPangoLayout); cdecl; external gdklib;
 procedure gdk_draw_layout_line_with_colors(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; line:PPangoLayoutLine;
 procedure gdk_draw_layout_line_with_colors(drawable:PGdkDrawable; gc:PGdkGC; x:gint; y:gint; line:PPangoLayoutLine;

+ 19 - 0
packages/gtk2/src/gtk+/gdk/gdkevents.inc

@@ -115,6 +115,13 @@
      GDK_SETTING_ACTION_DELETED
      GDK_SETTING_ACTION_DELETED
    );
    );
 
 
+   PGdkOwnerChange = ^TGdkOwnerChange;
+   TGdkOwnerChange = (
+     GDK_OWNER_CHANGE_NEW_OWNER,
+     GDK_OWNER_CHANGE_DESTROY,
+     GDK_OWNER_CHANGE_CLOSE
+   );
+
    PGdkEventAny = ^TGdkEventAny;
    PGdkEventAny = ^TGdkEventAny;
    TGdkEventAny = record
    TGdkEventAny = record
         _type : TGdkEventType;
         _type : TGdkEventType;
@@ -311,6 +318,18 @@
         name : Pchar;
         name : Pchar;
      end;
      end;
 
 
+   PGdkEventOwnerChange = ^TGdkEventOwnerChange;
+   TGdkEventOwnerChange = record
+        _type : TGdkEventType;
+        window : PGdkWindow;
+        send_event : gint8;
+        owner : TGdkNativeWindow;
+        reason : TGdkOwnerChange;
+        selection : TGdkAtom;
+        time : guint32;
+        selection_time : guint32;
+     end;
+
    PGdkEventWindowState = ^TGdkEventWindowState;
    PGdkEventWindowState = ^TGdkEventWindowState;
    TGdkEventWindowState = record
    TGdkEventWindowState = record
         _type : TGdkEventType;
         _type : TGdkEventType;

+ 89 - 0
packages/gtk2/src/gtk+/gdk/gdkpango.inc

@@ -1,6 +1,49 @@
 // included by gdk2.pp
 // included by gdk2.pp
 
 
+{$IFDEF read_forward_definitions}
+   PGdkPangoRenderer = ^TGdkPangoRenderer;
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
 {$IFDEF read_interface_types}
 {$IFDEF read_interface_types}
+   PGdkPangoRendererPrivate = ^TGdkPangoRendererPrivate;
+
+   TGdkPangoRenderer = record
+     // private
+     parent_instance: TPangoRenderer;
+
+     priv: PGdkPangoRendererPrivate;
+   end;
+
+
+   PGdkPangoRendererClass = ^TGdkPangoRendererClass;
+   TGdkPangoRendererClass = record
+     // private
+     parent_class: TPangoRendererClass;
+   end;
+   
+   TGdkPangoRendererPrivate = record
+     screen: PGdkScreen;
+
+     // GdkPangoRenderer specific state
+     override_color: array[TPangoRenderPart] of TPangoColor;
+     override_color_set: array[TPangoRenderPart] of gboolean;
+     
+     stipple: array[TPangoRenderPart] of PGdkBitmap;
+     emboss_color: TPangoColor;
+     embossed: gboolean;
+
+     // cr: Pcairo_t;
+     // last_part: TPangoRenderPart;
+
+     // Current target
+     // drawable: PGdkDrawable;
+     // base_gc: PGdkGC;
+
+     // gc_changed: gboolean;
+   end;
+
 { Attributes use to render insensitive text in GTK+.  }
 { Attributes use to render insensitive text in GTK+.  }
    PGdkPangoAttrStipple = ^TGdkPangoAttrStipple;
    PGdkPangoAttrStipple = ^TGdkPangoAttrStipple;
    TGdkPangoAttrStipple = record
    TGdkPangoAttrStipple = record
@@ -21,6 +64,23 @@
 
 
 {$IFDEF read_interface_rest}
 {$IFDEF read_interface_rest}
 
 
+{ Pango renderer }
+
+function GDK_TYPE_PANGO_RENDERER: GType;
+function GDK_PANGO_RENDERER(anObject: pointer): PGdkPangoRenderer;
+function GDK_IS_PANGO_RENDERER(anObject: pointer): boolean;
+function GDK_PANGO_RENDERER_CLASS(klass: pointer): PGdkPangoRendererClass;
+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;
+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;
+procedure gdk_pango_renderer_set_override_color(gdk_renderer:PGdkPangoRenderer; part:TPangoRenderPart; color:PGdkColor); cdecl; external gdklib;
+
 { Pango interaction  }
 { Pango interaction  }
 
 
 function gdk_pango_context_get_for_screen(screen:PGdkScreen):PPangoContext; cdecl; external gdklib;
 function gdk_pango_context_get_for_screen(screen:PGdkScreen):PPangoContext; cdecl; external gdklib;
@@ -46,4 +106,33 @@ function gdk_pango_attr_embossed_new(embossed:gboolean):PPangoAttribute; cdecl;
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 
 
 {$IFDEF read_implementation}
 {$IFDEF read_implementation}
+function GDK_TYPE_PANGO_RENDERER: GType;
+begin
+  GDK_TYPE_PANGO_RENDERER:=gdk_pango_renderer_get_type;
+end;
+
+function GDK_PANGO_RENDERER(anObject: pointer): PGdkPangoRenderer;
+begin
+  GDK_PANGO_RENDERER:=PGdkPangoRenderer(G_TYPE_CHECK_INSTANCE_CAST(anObject,GDK_TYPE_PANGO_RENDERER));
+end;
+
+function GDK_IS_PANGO_RENDERER(anObject: pointer): boolean;
+begin
+  GDK_IS_PANGO_RENDERER:=G_TYPE_CHECK_INSTANCE_TYPE(anObject,GDK_TYPE_PANGO_RENDERER);
+end;
+
+function GDK_PANGO_RENDERER_CLASS(klass: pointer): PGdkPangoRendererClass;
+begin
+  GDK_PANGO_RENDERER_CLASS:=PGdkPangoRendererClass(G_TYPE_CHECK_CLASS_CAST(klass,GDK_TYPE_PANGO_RENDERER));
+end;
+
+function GDK_IS_PANGO_RENDERER_CLASS(klass: pointer) : boolean;
+begin
+  GDK_IS_PANGO_RENDERER_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GDK_TYPE_PANGO_RENDERER);
+end;
+
+function GDK_PANGO_RENDERER_GET_CLASS(obj: pointer): PGdkPangoRendererClass;
+begin
+  GDK_PANGO_RENDERER_GET_CLASS:=PGdkPangoRendererClass(G_TYPE_INSTANCE_GET_CLASS(obj,GDK_TYPE_PANGO_RENDERER));
+end;
 {$ENDIF}
 {$ENDIF}

+ 3 - 0
packages/gtk2/src/gtk+/gdk/gdkwindow.inc

@@ -458,6 +458,8 @@ procedure gdk_window_set_debug_updates(setting:gboolean); cdecl; external gdklib
 procedure gdk_window_constrain_size(geometry:PGdkGeometry; flags:guint; width:gint; height:gint; new_width:Pgint;
 procedure gdk_window_constrain_size(geometry:PGdkGeometry; flags:guint; width:gint; height:gint; new_width:Pgint;
             new_height:Pgint); cdecl; external gdklib;
             new_height:Pgint); cdecl; external gdklib;
 procedure gdk_window_get_internal_paint_info(window:PGdkWindow; var real_drawable:PGdkDrawable; x_offset:Pgint; y_offset:Pgint); cdecl; external gdklib;
 procedure gdk_window_get_internal_paint_info(window:PGdkWindow; var real_drawable:PGdkDrawable; x_offset:Pgint; y_offset:Pgint); cdecl; external gdklib;
+procedure gdk_window_enable_synchronized_configure(window:PGdkWindow); cdecl; external gdklib;
+procedure gdk_window_configure_finished(window:PGdkWindow); cdecl; external gdklib;
 function gdk_set_pointer_hooks(new_hooks:PGdkPointerHooks):PGdkPointerHooks; cdecl; external gdklib;
 function gdk_set_pointer_hooks(new_hooks:PGdkPointerHooks):PGdkPointerHooks; cdecl; external gdklib;
 function gdk_get_default_root_window:PGdkWindow; cdecl; external gdklib;
 function gdk_get_default_root_window:PGdkWindow; cdecl; external gdklib;
 
 
@@ -486,6 +488,7 @@ procedure gdk_window_unfullscreen(window: PGdkWindow); cdecl; external gdklib;
 procedure gdk_window_set_accept_focus(window: PGdkWindow; accept_focus: gboolean); cdecl; external gdklib;
 procedure gdk_window_set_accept_focus(window: PGdkWindow; accept_focus: gboolean); cdecl; external gdklib;
 procedure gdk_window_set_keep_above(window: PGdkWindow; setting: gboolean); cdecl; external gdklib;
 procedure gdk_window_set_keep_above(window: PGdkWindow; setting: gboolean); cdecl; external gdklib;
 procedure gdk_window_set_keep_below(window: PGdkWindow; setting: gboolean); cdecl; external gdklib;
 procedure gdk_window_set_keep_below(window: PGdkWindow; setting: gboolean); cdecl; external gdklib;
+procedure gdk_window_set_focus_on_map(window: PGdkWindow; focus_on_map: gboolean); cdecl; external gdklib;
 {$endif read_interface_rest}
 {$endif read_interface_rest}
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------