paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-05 15:30:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed darwin incompatibilities

Browse Source
This commit is contained in:
Jonas Maebe 2004-05-02 19:14:47 +00:00
parent 26c0a0a3f3
commit 6b950b6959
11 changed files with 95 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/extra/gtk/gdk/gdk.pp
View File

@ -44,6 +44,7 @@ uses
{$ifdef os2}
const
gdkdll='gdk12';
{$linklib gdk12}
{$define gtkos2}
{$packrecords C}
@ -51,8 +52,16 @@ uses
const
{$ifdef FreeBSD}
gdkdll='gdk12';
{$linklib gdk12}
{$else}
{$ifdef darwin}
{$define gtkdarwin}
gdkdll='gdk-1.2.0';
{$linklib gdk-1.2.0}
{$else}
gdkdll='gdk';
{$linklib gdk}
{$endif}
{$endif}
{$linklib c}
{$linklib X11}
@ -98,7 +107,10 @@ implementation
end.
{
$Log$
Revision 1.6 2003-08-06 07:28:21 michael
Revision 1.7 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.6 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.5 2002/08/18 19:36:58 marco

8
packages/extra/gtk/gdk/gdkmain.pp
View File

@ -285,7 +285,10 @@ procedure gdk_draw_pixmap(drawable:PGdkDrawable; gc:PGdkGC; src:PGdkDrawable; xs
procedure gdk_draw_bitmap(drawable:PGdkDrawable; gc:PGdkGC; src:PGdkDrawable; xsrc:gint; ysrc:gint; xdest:gint; ydest:gint; width:gint; height:gint);cdecl;external gdkdll name 'gdk_draw_drawable';
{$else}
procedure gdk_draw_pixmap(drawable:PGdkDrawable; gc:PGdkGC; src:PGdkDrawable; xsrc:gint; ysrc:gint; xdest:gint; ydest:gint; width:gint; height:gint);cdecl;external gdkdll name 'gdk_draw_pixmap';
{$ifdef dummy}
{ this routine doesn't exist in gdk 1.2, it's an error in the headers }
procedure gdk_draw_bitmap(drawable:PGdkDrawable; gc:PGdkGC; src:PGdkDrawable; xsrc:gint; ysrc:gint; xdest:gint; ydest:gint; width:gint; height:gint);cdecl;external gdkdll name 'gdk_draw_bitmap';
{$endif dummy}
{$endif}
procedure gdk_draw_image(drawable:PGdkDrawable; gc:PGdkGC; image:PGdkImage; xsrc:gint; ysrc:gint; xdest:gint; ydest:gint; width:gint; height:gint);cdecl;external gdkdll name 'gdk_draw_image';
procedure gdk_draw_points(drawable:PGdkDrawable; gc:PGdkGC; points:PGdkPoint; npoints:gint);cdecl;external gdkdll name 'gdk_draw_points';
@ -387,7 +390,10 @@ procedure gdk_threads_leave;cdecl;external gdkdll name 'gdk_threads_leave';
{
$Log$
Revision 1.5 2004-04-01 12:25:37 michael
Revision 1.6 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.5 2004/04/01 12:25:37 michael
+ Fixed gdk_ic_new,gdk_ic_attr_new, gdk_ic_attr_destroy gdk_ic_set_attr gdk_ic_get_attr, noted by marc weustink
Revision 1.4 2003/08/06 07:28:21 michael

10
packages/extra/gtk/gdk/gdkpixbuf.pp
View File

@ -108,8 +108,13 @@ Uses
{$Ifdef FPC}
var
{$ifndef darwin}
gdk_pixbuf_major_version : guint; cvar; external;
gdk_pixbuf_version : Pchar; cvar; external;
{$else darwin}
gdk_pixbuf_major_version : guint; external libgdkpixbuf name 'gdk_pixbuf_major_version';
gdk_pixbuf_version : Pchar; external libgdkpixbuf name 'gdk_pixbuf_version';
{$endif darwin}
{$EndIf}
{From gdk-pixbuf.h}
@ -440,7 +445,10 @@ end.
{
$Log$
Revision 1.3 2003-03-02 02:08:50 hajny
Revision 1.4 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.3 2003/03/02 02:08:50 hajny
+ OS/2 support for GTK and X11 added by Yuri
Revision 1.2 2002/09/07 15:42:58 peter

7
packages/extra/gtk/gdk/gdkprivate.pp
View File

@ -226,7 +226,9 @@ procedure gdk_window_add_colormap_windows(window:PGdkWindow);cdecl;external gdkd
procedure gdk_window_destroy_notify(window:PGdkWindow);cdecl;external gdkdll name 'gdk_window_destroy_notify';
procedure gdk_xid_table_remove(xid:TXID);cdecl;external gdkdll name 'gdk_xid_table_remove';
function gdk_send_xevent(window:TWindow; propagate:gboolean; event_mask:glong; event_send:pXEvent):gint;cdecl;external gdkdll name 'gdk_send_xevent';
{$ifndef gtkdarwin}
procedure gdk_dnd_display_drag_cursor(x:gint; y:gint; drag_ok:gboolean; change_made:gboolean);cdecl;external gdkdll name 'gdk_dnd_display_drag_cursor';
{$endif not gtkdarwin}
function gdk_window_xid_at(base:TWindow; bx:gint; by:gint; x:gint; y:gint; excludes:PGList; excl_child:gboolean):TWindow;cdecl;external gdkdll name 'gdk_window_xid_at';
function gdk_window_xid_at_coords(x:gint; y:gint; excludes:PGList; excl_child:gboolean):TWindow;cdecl;external gdkdll name 'gdk_window_xid_at_coords';
@ -320,7 +322,10 @@ function GDK_font_lookup(xid : longint) : PGdkFont;
{
$Log$
Revision 1.4 2003-08-06 07:28:21 michael
Revision 1.5 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.4 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.3 2003/03/02 02:08:50 hajny

7
packages/extra/gtk/gdk/gdkx.pp
View File

@ -27,7 +27,9 @@ function GDK_FONT_XFONT(font : PGdkFontPrivate) : gpointer;
function gdkx_visual_get(xvisualid:TVisualID):PGdkVisual;cdecl;external gdkdll name 'gdkx_visual_get';
function gdkx_colormap_get(xcolormap:TColormap):PGdkColormap;cdecl;external gdkdll name 'gdkx_colormap_get';
{$ifndef gtkdarwin}
function gdk_get_client_window(dpy:pDisplay; win:TWindow):TWindow;cdecl;external gdkdll name 'gdk_get_client_window';
{$endif not gtkdarwin}
{$endif}
{$endif}
@ -124,7 +126,10 @@ function GDK_FONT_XFONT(font : PGdkFontPrivate) : gpointer;
{
$Log$
Revision 1.4 2003-08-06 07:28:21 michael
Revision 1.5 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.4 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.3 2003/03/02 02:08:50 hajny

12
packages/extra/gtk/glib/glib.pp
View File

@ -47,8 +47,15 @@ interface
const
{$ifdef FreeBSD}
glibdll='glib12';
{$linklib glib12}
{$else}
{$ifdef darwin}
glibdll='glib-1.2.0';
{$linklib glib-1.2.0}
{$else darwin}
glibdll='glib';
{$linklib glib}
{$endif darwin}
{$endif}
{$linklib c}
@ -1648,7 +1655,10 @@ procedure set_year(var a : TGDate; __year : guint);
end.
{
$Log$
Revision 1.6 2003-08-06 07:28:21 michael
Revision 1.7 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.6 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.5 2002/08/18 19:36:58 marco

15
packages/extra/gtk/gtk/gtk.pp
View File

@ -51,9 +51,17 @@ uses
const
{$ifdef FreeBSD}
gtkdll='gtk12';
{$linklib gtk12}
{$else}
{$ifdef darwin}
{$define gtkdarwin}
gtkdll='gtk-1.2.0';
{$linklib gtk-1.2.0}
{$else}
gtkdll='gtk';
{$endif}
{$linklib gtk}
{$endif darwin}
{$endif freebsd}
{$linklib c}
{$linklib Xi}
{$linklib Xext}
@ -90,7 +98,10 @@ Type
end.
{
$Log$
Revision 1.6 2003-08-06 07:28:21 michael
Revision 1.7 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.6 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.5 2002/08/18 19:36:58 marco

7
packages/extra/gtk/gtk/gtkaccelgroup.pp
View File

@ -54,9 +54,11 @@ procedure gtk_accel_group_handle_remove(_object:PGtkObject; accel_group:PGtkAcce
function gtk_accel_group_create_add(class_type:TGtkType; signal_flags:TGtkSignalRunType; handler_offset:guint):guint;cdecl;external gtkdll name 'gtk_accel_group_create_add';
function gtk_accel_group_create_remove(class_type:TGtkType; signal_flags:TGtkSignalRunType; handler_offset:guint):guint;cdecl;external gtkdll name 'gtk_accel_group_create_remove';
{$ifndef gtkwin}
{$ifndef darwin}
procedure gtk_accel_group_marshal_add(_object:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_accel_group_marshal_add';
procedure gtk_accel_group_marshal_remove(_object:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_accel_group_marshal_remove';
{$endif}
{$endif}
function gtk_accel_groups_from_object(_object:PGtkObject):PGSList;cdecl;external gtkdll name 'gtk_accel_groups_from_object';
function gtk_accel_group_entries_from_object(_object:PGtkObject):PGSList;cdecl;external gtkdll name 'gtk_accel_group_entries_from_object';
function gtk_accelerator_valid(keyval:guint; modifiers:TGdkModifierType):gboolean;cdecl;external gtkdll name 'gtk_accelerator_valid';
@ -78,7 +80,10 @@ function gtk_accelerator_get_default_mod_mask:guint;cdecl;external gtkdll name
{
$Log$
Revision 1.2 2002-09-07 15:42:59 peter
Revision 1.3 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.2 2002/09/07 15:42:59 peter
* old logs removed and tabs fixed
Revision 1.1 2002/01/29 17:55:08 peter

13
packages/extra/gtk/gtk/gtkmarshal.pp
View File

@ -8,6 +8,10 @@
{$ifdef read_interface}
{$ifdef gtkdarwin}
{$define gtkwin}
{$endif gtkdarwin}
procedure gtk_marshal_BOOL__NONE(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__NONE';
procedure gtk_marshal_BOOL__POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER';
procedure gtk_marshal_BOOL__POINTER_POINTER_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_POINTER_INT_INT';
@ -88,6 +92,10 @@ procedure gtk_marshal_NONE__UINT_STRING(theobject:PGtkObject; func:TGtkSignalFun
{$endif}
procedure gtk_marshal_NONE__INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_POINTER';
{$ifdef gtkdarwin}
{$undef gtkwin}
{$endif gtkdarwin}
{$endif read_interface}
@ -101,7 +109,10 @@ procedure gtk_marshal_NONE__INT_POINTER(theobject:PGtkObject; func:TGtkSignalFun
{
$Log$
Revision 1.2 2002-09-07 15:43:00 peter
Revision 1.3 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.2 2002/09/07 15:43:00 peter
* old logs removed and tabs fixed
Revision 1.1 2002/01/29 17:55:12 peter

7
packages/extra/gtk/gtk/gtkscale.pp
View File

@ -48,7 +48,9 @@ procedure gtk_scale_set_draw_value(scale:PGtkScale; draw_value:gboolean);cdecl;e
procedure gtk_scale_set_value_pos(scale:PGtkScale; pos:TGtkPositionType);cdecl;external gtkdll name 'gtk_scale_set_value_pos';
procedure gtk_scale_draw_value(scale:PGtkScale);cdecl;external gtkdll name 'gtk_scale_draw_value';
{$ifndef gtkwin}
{$ifndef gtkdarwin}
function gtk_scale_value_width(scale:PGtkScale):gint;cdecl;external gtkdll name 'gtk_scale_value_width';
{$endif not gtkdarwin}
{$endif}
{$endif read_interface}
@ -95,7 +97,10 @@ end;
{
$Log$
Revision 1.3 2003-08-06 07:28:21 michael
Revision 1.4 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.3 2003/08/06 07:28:21 michael
+ Patch from Marc Weustinck to fix Win32 version
Revision 1.2 2002/09/07 15:43:00 peter

7
packages/extra/gtk/gtk/gtkthemes.pp
View File

@ -16,8 +16,10 @@
function gtk_theme_engine_get(name:Pgchar):PGtkThemeEngine;cdecl;external gtkdll name 'gtk_theme_engine_get';
procedure gtk_theme_engine_ref(engine:PGtkThemeEngine);cdecl;external gtkdll name 'gtk_theme_engine_ref';
procedure gtk_theme_engine_unref(engine:PGtkThemeEngine);cdecl;external gtkdll name 'gtk_theme_engine_unref';
{$ifndef gtkdarwin}
procedure gtk_themes_init(argc:plongint; argv:pppchar);cdecl;external gtkdll name 'gtk_themes_init';
procedure gtk_themes_exit(error_code:gint);cdecl;external gtkdll name 'gtk_themes_exit';
{$endif not gtkdarwin}
{$endif}
{$endif read_interface}
@ -33,7 +35,10 @@ procedure gtk_themes_exit(error_code:gint);cdecl;external gtkdll name 'gtk_theme
{
$Log$
Revision 1.2 2002-09-07 15:43:00 peter
Revision 1.3 2004-05-02 19:14:47 jonas
* fixed darwin incompatibilities
Revision 1.2 2002/09/07 15:43:00 peter
* old logs removed and tabs fixed
Revision 1.1 2002/01/29 17:55:14 peter