diff --git a/packages/extra/gtk/gdk/gdk.pp b/packages/extra/gtk/gdk/gdk.pp index 8e5e69962f..999bc5b43d 100644 --- a/packages/extra/gtk/gdk/gdk.pp +++ b/packages/extra/gtk/gdk/gdk.pp @@ -36,7 +36,7 @@ uses {$ifdef win32} const - gdkdll='gdk-1.3'; + gdkdll='libgdk-0'; {$define gtkwin} {$packrecords C} @@ -49,7 +49,7 @@ uses {$packrecords C} {$else} const - {$ifdef BSD} + {$ifdef FreeBSD} gdkdll='gdk12'; {$else} gdkdll='gdk'; @@ -98,7 +98,13 @@ implementation end. { $Log$ - Revision 1.4 2003-03-02 02:08:50 hajny + 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 + * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. + + Revision 1.4 2003/03/02 02:08:50 hajny + OS/2 support for GTK and X11 added by Yuri Revision 1.3 2002/09/07 15:42:58 peter diff --git a/packages/extra/gtk/gdk/gdkmain.pp b/packages/extra/gtk/gdk/gdkmain.pp index 0bc4fc6961..01776ce8c3 100644 --- a/packages/extra/gtk/gdk/gdkmain.pp +++ b/packages/extra/gtk/gdk/gdkmain.pp @@ -100,9 +100,7 @@ procedure gdk_window_merge_child_shapes(window:PGdkWindow);cdecl;external gdkdll function gdk_window_is_visible(window:PGdkWindow):gboolean;cdecl;external gdkdll name 'gdk_window_is_visible'; function gdk_window_is_viewable(window:PGdkWindow):gboolean;cdecl;external gdkdll name 'gdk_window_is_viewable'; function gdk_window_set_static_gravities(window:PGdkWindow; use_static:gboolean):gboolean;cdecl;external gdkdll name 'gdk_window_set_static_gravities'; -{$ifndef gtkwin} procedure gdk_add_client_message_filter(message_type:TGdkAtom; func:TGdkFilterFunc; data:gpointer);cdecl;external gdkdll name 'gdk_add_client_message_filter'; -{$endif} function gdk_drag_context_new:PGdkDragContext;cdecl;external gdkdll name 'gdk_drag_context_new'; procedure gdk_drag_context_ref(context:PGdkDragContext);cdecl;external gdkdll name 'gdk_drag_context_ref'; procedure gdk_drag_context_unref(context:PGdkDragContext);cdecl;external gdkdll name 'gdk_drag_context_unref'; @@ -329,10 +327,8 @@ function gdk_ic_new(attr:TGdkICAttr; mask:TGdkICAttributesType):TGdkIC;cdecl;ex procedure gdk_ic_destroy(ic:TGdkIC);cdecl;external gdkdll name 'gdk_ic_destroy'; function gdk_ic_get_style(ic:TGdkIC):TGdkIMStyle;cdecl;external gdkdll name 'gdk_ic_get_style'; function gdk_ic_get_events(ic:TGdkIC):TGdkEventMask;cdecl;external gdkdll name 'gdk_ic_get_events'; -{$ifndef gtkwin} function gdk_ic_attr_new:TGdkICAttr;cdecl;external gdkdll name 'gdk_ic_attr_new'; procedure gdk_ic_attr_destroy(attr:TGdkICAttr);cdecl;external gdkdll name 'gdk_ic_attr_destroy'; -{$endif} function gdk_ic_set_attr(ic:TGdkIC; attr:TGdkICAttr; mask:TGdkICAttributesType):TGdkICAttributesType;cdecl;external gdkdll name 'gdk_ic_set_attr'; function gdk_ic_get_attr(ic:TGdkIC; attr:TGdkICAttr; mask:TGdkICAttributesType):TGdkICAttributesType;cdecl;external gdkdll name 'gdk_ic_get_attr'; function gdk_wcstombs(src:PGdkWChar):Pgchar;cdecl;external gdkdll name 'gdk_wcstombs'; @@ -391,7 +387,10 @@ procedure gdk_threads_leave;cdecl;external gdkdll name 'gdk_threads_leave'; { $Log$ - Revision 1.3 2003-03-02 02:08:50 hajny + 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 + OS/2 support for GTK and X11 added by Yuri Revision 1.2 2002/09/07 15:42:58 peter diff --git a/packages/extra/gtk/gdk/gdkprivate.pp b/packages/extra/gtk/gdk/gdkprivate.pp index 411bc64627..7189ff9ffc 100644 --- a/packages/extra/gtk/gdk/gdkprivate.pp +++ b/packages/extra/gtk/gdk/gdkprivate.pp @@ -198,11 +198,22 @@ procedure set_guffaw_gravity(var a : TGdkWindowPrivate; __guffaw_gravity : guint GDK_DEBUG_DND := 1 shl 2,GDK_DEBUG_COLOR_CONTEXT := 1 shl 3, GDK_DEBUG_XIM := 1 shl 4); -{$ifndef gtkwin} +procedure gdk_xid_table_insert(xid:TXID; data:gpointer);cdecl;external gdkdll name 'gdk_xid_table_insert'; +function gdk_xid_table_lookup(xid:TXID):gpointer;cdecl;external gdkdll name 'gdk_xid_table_lookup'; + function GDK_window_lookup(xid : longint) : PGdkWindow; function GDK_pixmap_lookup(xid : longint) : PGdkPixmap; function GDK_font_lookup(xid : longint) : PGdkFont; +{$ifndef os2} + var + gdk_selection_property : TAtom;external gdkdll name 'gdk_selection_property'; + gdk_progclass : Pgchar;external gdkdll name 'gdk_progclass'; + gdk_error_code : gint;external gdkdll name 'gdk_error_code'; + gdk_null_window_warnings : gint;external gdkdll name 'gdk_null_window_warnings'; +{$endif} + +{$ifndef gtkwin} procedure gdk_events_init;cdecl;external gdkdll name 'gdk_events_init'; procedure gdk_window_init;cdecl;external gdkdll name 'gdk_window_init'; procedure gdk_visual_init;cdecl;external gdkdll name 'gdk_visual_init'; @@ -213,9 +224,7 @@ function gdk_colormap_lookup(xcolormap:TColormap):PGdkColormap;cdecl;external g function gdk_visual_lookup(xvisual:pVisual):PGdkVisual;cdecl;external gdkdll name 'gdk_visual_lookup'; procedure gdk_window_add_colormap_windows(window:PGdkWindow);cdecl;external gdkdll name 'gdk_window_add_colormap_windows'; procedure gdk_window_destroy_notify(window:PGdkWindow);cdecl;external gdkdll name 'gdk_window_destroy_notify'; -procedure gdk_xid_table_insert(xid:TXID; data:gpointer);cdecl;external gdkdll name 'gdk_xid_table_insert'; procedure gdk_xid_table_remove(xid:TXID);cdecl;external gdkdll name 'gdk_xid_table_remove'; -function gdk_xid_table_lookup(xid:TXID):gpointer;cdecl;external gdkdll name 'gdk_xid_table_lookup'; function gdk_send_xevent(window:TWindow; propagate:gboolean; event_mask:glong; event_send:pXEvent):gint;cdecl;external gdkdll name 'gdk_send_xevent'; 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'; 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'; @@ -233,12 +242,8 @@ function gdk_window_xid_at_coords(x:gint; y:gint; excludes:PGList; excl_child:g gdk_wm_delete_window : TAtom;external gdkdll name 'gdk_wm_delete_window'; gdk_wm_take_focus : TAtom;external gdkdll name 'gdk_wm_take_focus'; gdk_wm_protocols : TAtom;external gdkdll name 'gdk_wm_protocols'; - gdk_selection_property : TAtom;external gdkdll name 'gdk_selection_property'; gdk_dnd : TGdkDndGlobals;external gdkdll name 'gdk_dnd'; - gdk_progclass : Pgchar;external gdkdll name 'gdk_progclass'; - gdk_error_code : gint;external gdkdll name 'gdk_error_code'; gdk_error_warnings : gint;external gdkdll name 'gdk_error_warnings'; - gdk_null_window_warnings : gint;external gdkdll name 'gdk_null_window_warnings'; gdk_default_filters : PGList;external gdkdll name 'gdk_default_filters'; gdk_nevent_masks : longint;external gdkdll name 'gdk_nevent_masks'; gdk_xgrab_window : PGdkWindowPrivate;external gdkdll name 'gdk_xgrab_window'; @@ -295,7 +300,6 @@ procedure set_guffaw_gravity(var a : TGdkWindowPrivate; __guffaw_gravity : guint a.flag0:=a.flag0 or ((__guffaw_gravity shl bp_TGdkWindowPrivate_guffaw_gravity) and bm_TGdkWindowPrivate_guffaw_gravity); end; -{$ifndef gtkwin} function GDK_window_lookup(xid : longint) : PGdkWindow; begin gdk_window_lookup:=PGdkWindow(gdk_xid_table_lookup(xid)); @@ -310,14 +314,16 @@ function GDK_font_lookup(xid : longint) : PGdkFont; begin gdk_font_lookup:=PGdkFont(gdk_xid_table_lookup(xid)); end; -{$endif} {$endif read_implementation} { $Log$ - Revision 1.3 2003-03-02 02:08:50 hajny + 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 + OS/2 support for GTK and X11 added by Yuri Revision 1.2 2002/09/07 15:42:58 peter diff --git a/packages/extra/gtk/gdk/gdkx.pp b/packages/extra/gtk/gdk/gdkx.pp index 430e9662dc..fb28654163 100644 --- a/packages/extra/gtk/gdk/gdkx.pp +++ b/packages/extra/gtk/gdk/gdkx.pp @@ -28,11 +28,13 @@ 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'; function gdk_get_client_window(dpy:pDisplay; win:TWindow):TWindow;cdecl;external gdkdll name 'gdk_get_client_window'; -function gdk_pixmap_foreign_new(anid:guint32):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_foreign_new'; -function gdk_window_foreign_new(anid:guint32):PGdkWindow;cdecl;external gdkdll name 'gdk_window_foreign_new'; {$endif} {$endif} +{$ifndef gtkos2} +function gdk_pixmap_foreign_new(anid:guint32):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_foreign_new'; +function gdk_window_foreign_new(anid:guint32):PGdkWindow;cdecl;external gdkdll name 'gdk_window_foreign_new'; +{$endif} {$endif read_interface} @@ -122,7 +124,10 @@ function GDK_FONT_XFONT(font : PGdkFontPrivate) : gpointer; { $Log$ - Revision 1.3 2003-03-02 02:08:50 hajny + 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 + OS/2 support for GTK and X11 added by Yuri Revision 1.2 2002/09/07 15:42:58 peter diff --git a/packages/extra/gtk/glib/glib.pp b/packages/extra/gtk/glib/glib.pp index 0e7f1b1a0f..b62819838b 100644 --- a/packages/extra/gtk/glib/glib.pp +++ b/packages/extra/gtk/glib/glib.pp @@ -32,7 +32,7 @@ interface {$ifdef win32} const - glibdll='glib-1.3'; + glibdll='libglib-2.0-0'; {$define gtkwin} {$packrecords C} @@ -45,7 +45,7 @@ interface {$packrecords C} {$else} const - {$ifdef BSD} + {$ifdef FreeBSD} glibdll='glib12'; {$else} glibdll='glib'; @@ -491,8 +491,8 @@ type {$ifndef gtkwin} procedure g_list_push_allocator(allocator:PGAllocator);cdecl;external glibdll name 'g_list_push_allocator'; -procedure g_list_pop_allocator;cdecl;external glibdll name 'g_list_pop_allocator'; {$endif} +procedure g_list_pop_allocator;cdecl;external glibdll name 'g_list_pop_allocator'; function g_list_alloc:PGList;cdecl;external glibdll name 'g_list_alloc'; procedure g_list_free(list:PGList);cdecl;external glibdll name 'g_list_free'; procedure g_list_free_1(list:PGList);cdecl;external glibdll name 'g_list_free_1'; @@ -519,10 +519,8 @@ function g_list_nth_data(list:PGList; n:guint):gpointer;cdecl;external glibdll function g_list_previous(list : PGlist) : PGlist; function g_list_next(list : PGlist) : PGlist; -{$ifndef gtkwin} procedure g_slist_push_allocator(allocator:PGAllocator);cdecl;external glibdll name 'g_slist_push_allocator'; procedure g_slist_pop_allocator;cdecl;external glibdll name 'g_slist_pop_allocator'; -{$endif} function g_slist_alloc:PGSList;cdecl;external glibdll name 'g_slist_alloc'; procedure g_slist_free(list:PGSList);cdecl;external glibdll name 'g_slist_free'; procedure g_slist_free_1(list:PGSList);cdecl;external glibdll name 'g_slist_free_1'; @@ -578,10 +576,8 @@ function g_tree_nnodes(tree:PGTree):gint;cdecl;external glibdll name 'g_tree_nn function G_NODE_IS_ROOT(node : PGNode) : boolean; function G_NODE_IS_LEAF(node : PGNode) : boolean; -{$ifndef gtkwin} procedure g_node_push_allocator(allocator:PGAllocator);cdecl;external glibdll name 'g_node_push_allocator'; procedure g_node_pop_allocator;cdecl;external glibdll name 'g_node_pop_allocator'; -{$endif} function g_node_new(data:gpointer):PGNode;cdecl;external glibdll name 'g_node_new'; procedure g_node_destroy(root:PGNode);cdecl;external glibdll name 'g_node_destroy'; procedure g_node_unlink(node:PGNode);cdecl;external glibdll name 'g_node_unlink'; @@ -677,7 +673,6 @@ procedure g_free(mem:gpointer);cdecl;external glibdll name 'g_free'; procedure g_mem_profile;cdecl;external glibdll name 'g_mem_profile'; procedure g_mem_check(mem:gpointer);cdecl;external glibdll name 'g_mem_check'; -{$ifndef gtkwin} const G_ALLOCATOR_LIST = 1; G_ALLOCATOR_SLIST = 2; @@ -685,7 +680,6 @@ procedure g_mem_check(mem:gpointer);cdecl;external glibdll name 'g_mem_check'; function g_allocator_new(name:Pgchar; n_preallocs:guint):PGAllocator;cdecl;external glibdll name 'g_allocator_new'; procedure g_allocator_free(allocator:PGAllocator);cdecl;external glibdll name 'g_allocator_free'; -{$endif} const G_ALLOC_ONLY = 1; @@ -716,26 +710,20 @@ function g_strtod(nptr:Pgchar; endptr:PPgchar):gdouble;cdecl;external glibdll n function g_strerror(errnum:gint):Pgchar;cdecl;external glibdll name 'g_strerror'; function g_strsignal(signum:gint):Pgchar;cdecl;external glibdll name 'g_strsignal'; function g_strcasecmp(s1:Pgchar; s2:Pgchar):gint;cdecl;external glibdll name 'g_strcasecmp'; -{$ifndef gtkwin} function g_strncasecmp(s1:Pgchar; s2:Pgchar; n:guint):gint;cdecl;external glibdll name 'g_strncasecmp'; -{$endif} procedure g_strdown(thestring:Pgchar);cdecl;external glibdll name 'g_strdown'; procedure g_strup(thestring:Pgchar);cdecl;external glibdll name 'g_strup'; procedure g_strreverse(thestring:Pgchar);cdecl;external glibdll name 'g_strreverse'; -{$ifndef gtkwin} function g_strchug(thestring:Pgchar):Pgchar;cdecl;external glibdll name 'g_strchug'; function g_strchomp(thestring:Pgchar):Pgchar;cdecl;external glibdll name 'g_strchomp'; function g_strstrip(thestring : Pgchar) : Pgchar; -{$endif} function g_strdup(str:Pgchar):Pgchar;cdecl;external glibdll name 'g_strdup'; function g_strdup_printf(format:Pgchar;args:array of const):Pgchar;cdecl;external glibdll name 'g_strdup_printf'; function g_strdup_vprintf(format:Pgchar; args:array of const):Pgchar;cdecl;external glibdll name 'g_strdup_vprintf'; function g_strndup(str:Pgchar; n:guint):Pgchar;cdecl;external glibdll name 'g_strndup'; function g_strnfill(length:guint; fill_char:gchar):Pgchar;cdecl;external glibdll name 'g_strnfill'; function g_strconcat(string1:Pgchar; args:array of const):Pgchar;cdecl;external glibdll name 'g_strconcat'; -{$ifndef gtkwin} function g_strjoin(separator:Pgchar; args:array of const):Pgchar;cdecl;external glibdll name 'g_strjoin'; -{$endif} function g_strescape(thestring:Pgchar):Pgchar;cdecl;external glibdll name 'g_strescape'; function g_memdup(mem:gconstpointer; byte_size:guint):gpointer;cdecl;external glibdll name 'g_memdup'; function g_strsplit(thestring:Pgchar; delimiter:Pgchar; max_tokens:gint):PPgchar;cdecl;external glibdll name 'g_strsplit'; @@ -1061,9 +1049,7 @@ function g_relation_exists(relation:PGRelation; args:array of const):gboolean;c procedure g_relation_print(relation:PGRelation);cdecl;external glibdll name 'g_relation_print'; procedure g_tuples_destroy(tuples:PGTuples);cdecl;external glibdll name 'g_tuples_destroy'; function g_tuples_index(tuples:PGTuples; index:gint; field:gint):gpointer;cdecl;external glibdll name 'g_tuples_index'; -{$ifndef gtkwin} function g_spaced_primes_closest(num:guint):guint;cdecl;external glibdll name 'g_spaced_primes_closest'; -{$endif} type TGIOError = longint; @@ -1142,9 +1128,7 @@ function g_source_add(priority:gint; can_recurse:gboolean; funcs:PGSourceFuncs; function g_source_remove(tag:guint):gboolean;cdecl;external glibdll name 'g_source_remove'; function g_source_remove_by_user_data(user_data:gpointer):gboolean;cdecl;external glibdll name 'g_source_remove_by_user_data'; function g_source_remove_by_source_data(source_data:gpointer):gboolean;cdecl;external glibdll name 'g_source_remove_by_source_data'; -{$ifndef gtkwin} function g_source_remove_by_funcs_user_data(funcs:PGSourceFuncs; user_data:gpointer):gboolean;cdecl;external glibdll name 'g_source_remove_by_funcs_user_data'; -{$endif} procedure g_get_current_time(result:PGTimeVal);cdecl;external glibdll name 'g_get_current_time'; function g_main_new(is_running:gboolean):PGMainLoop;cdecl;external glibdll name 'g_main_new'; procedure g_main_run(loop:PGMainLoop);cdecl;external glibdll name 'g_main_run'; @@ -1301,12 +1285,10 @@ begin g_hook_insert_before(hook_list,nil,hook); end; -{$ifndef gtkwin} function g_strstrip(thestring : Pgchar) : Pgchar; begin g_strstrip:=g_strchomp(g_strchug(thestring)); end; -{$endif} function g_array_append_val(a:PGArray;v : longint) : PGarray; begin @@ -1666,7 +1648,13 @@ procedure set_year(var a : TGDate; __year : guint); end. { $Log$ - Revision 1.4 2003-03-02 02:10:19 hajny + 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 + * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. + + Revision 1.4 2003/03/02 02:10:19 hajny + OS/2 support for GTK and X11 added by Yuri Revision 1.3 2002/09/07 15:42:58 peter diff --git a/packages/extra/gtk/glib/gmodule.pp b/packages/extra/gtk/glib/gmodule.pp index fee919479f..411300670e 100644 --- a/packages/extra/gtk/glib/gmodule.pp +++ b/packages/extra/gtk/glib/gmodule.pp @@ -35,7 +35,7 @@ uses {$ifdef win32} const - gmoduledll='gmodule-1.3'; + gmoduledll='libgmodule-2.0-0'; {$define gtkwin} {$packrecords C} @@ -86,7 +86,10 @@ implementation end. { $Log$ - Revision 1.3 2003-03-02 02:10:19 hajny + 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:10:19 hajny + OS/2 support for GTK and X11 added by Yuri Revision 1.2 2002/09/07 15:42:59 peter diff --git a/packages/extra/gtk/gtk/gtk.pp b/packages/extra/gtk/gtk/gtk.pp index 53cc11ff0a..80f105ed20 100644 --- a/packages/extra/gtk/gtk/gtk.pp +++ b/packages/extra/gtk/gtk/gtk.pp @@ -36,7 +36,7 @@ uses {$ifdef win32} const - gtkdll='gtk-1.3'; + gtkdll='libgtk-0'; {$define gtkwin} {$packrecords c} @@ -49,7 +49,7 @@ uses {$packrecords c} {$else} const - {$ifdef BSD} + {$ifdef FreeBSD} gtkdll='gtk12'; {$else} gtkdll='gtk'; @@ -90,7 +90,13 @@ Type end. { $Log$ - Revision 1.4 2003-03-02 02:11:10 hajny + 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 + * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. + + Revision 1.4 2003/03/02 02:11:10 hajny + OS/2 support for GTK and X11 added by Yuri Revision 1.3 2002/09/07 15:42:59 peter diff --git a/packages/extra/gtk/gtk/gtkcontainer.pp b/packages/extra/gtk/gtk/gtkcontainer.pp index 24cd51295b..6cdfb784cb 100644 --- a/packages/extra/gtk/gtk/gtkcontainer.pp +++ b/packages/extra/gtk/gtk/gtkcontainer.pp @@ -72,9 +72,7 @@ procedure gtk_container_set_focus_vadjustment(container:PGtkContainer; adjustmen procedure gtk_container_set_focus_hadjustment(container:PGtkContainer; adjustment:PGtkAdjustment);cdecl;external gtkdll name 'gtk_container_set_focus_hadjustment'; procedure gtk_container_register_toplevel(container:PGtkContainer);cdecl;external gtkdll name 'gtk_container_register_toplevel'; procedure gtk_container_unregister_toplevel(container:PGtkContainer);cdecl;external gtkdll name 'gtk_container_unregister_toplevel'; -{$ifndef gtkwin} function gtk_container_get_toplevels:PGList;cdecl;external gtkdll name 'gtk_container_get_toplevels'; -{$endif} procedure gtk_container_resize_children(container:PGtkContainer);cdecl;external gtkdll name 'gtk_container_resize_children'; function gtk_container_child_type(container:PGtkContainer):TGtkType;cdecl;external gtkdll name 'gtk_container_child_type'; procedure gtk_container_add_child_arg_type(arg_name:Pgchar; arg_type:TGtkType; arg_flags:guint; arg_id:guint);cdecl;external gtkdll name 'gtk_container_add_child_arg_type'; @@ -85,7 +83,6 @@ procedure gtk_container_add_with_args(container:PGtkContainer; widget:PGtkWidget procedure gtk_container_addv(container:PGtkContainer; widget:PGtkWidget; n_args:guint; args:PGtkArg);cdecl;external gtkdll name 'gtk_container_addv'; procedure gtk_container_child_set(container:PGtkContainer; child:PGtkWidget; first_arg_name:Pgchar; args:array of const);cdecl;external gtkdll name 'gtk_container_child_set'; procedure gtk_container_queue_resize(container:PGtkContainer);cdecl;external gtkdll name 'gtk_container_queue_resize'; -{$ifndef gtkwin} procedure gtk_container_clear_resize_widgets(container:PGtkContainer);cdecl;external gtkdll name 'gtk_container_clear_resize_widgets'; procedure gtk_container_arg_set(container:PGtkContainer; child:PGtkWidget; arg:PGtkArg; info:PGtkArgInfo);cdecl;external gtkdll name 'gtk_container_arg_set'; procedure gtk_container_arg_get(container:PGtkContainer; child:PGtkWidget; arg:PGtkArg; info:PGtkArgInfo);cdecl;external gtkdll name 'gtk_container_arg_get'; @@ -93,7 +90,6 @@ function gtk_container_child_args_collect(object_type:TGtkType; arg_list_p:PPGS function gtk_container_child_arg_get_info(object_type:TGtkType; arg_name:Pgchar; info_p:PPGtkArgInfo):Pgchar;cdecl;external gtkdll name 'gtk_container_child_arg_get_info'; procedure gtk_container_forall(container:PGtkContainer; callback:TGtkCallback; callback_data:gpointer);cdecl;external gtkdll name 'gtk_container_forall'; function gtk_container_child_composite_name(container:PGtkContainer; child:PGtkWidget):Pgchar;cdecl;external gtkdll name 'gtk_container_child_composite_name'; -{$endif} {$endif read_interface} @@ -149,7 +145,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:42:59 peter + 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:42:59 peter * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:10 peter diff --git a/packages/extra/gtk/gtk/gtkdnd.pp b/packages/extra/gtk/gtk/gtkdnd.pp index 24556a5966..dbcd8e4b12 100644 --- a/packages/extra/gtk/gtk/gtkdnd.pp +++ b/packages/extra/gtk/gtk/gtkdnd.pp @@ -25,9 +25,7 @@ procedure gtk_drag_dest_set(widget:PGtkWidget; flags:TGtkDestDefaults; targets:P procedure gtk_drag_dest_set_proxy(widget:PGtkWidget; proxy_window:PGdkWindow; protocol:TGdkDragProtocol; use_coordinates:gboolean);cdecl;external gtkdll name 'gtk_drag_dest_set_proxy'; procedure gtk_drag_dest_unset(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_drag_dest_unset'; procedure gtk_drag_source_set(widget:PGtkWidget; start_button_mask:TGdkModifierType; targets:PGtkTargetEntry; n_targets:gint; actions:TGdkDragAction);cdecl;external gtkdll name 'gtk_drag_source_set'; -{$ifndef win32} procedure gtk_drag_source_unset(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_drag_source_unset'; -{$endif} procedure gtk_drag_source_set_icon(widget:PGtkWidget; colormap:PGdkColormap; pixmap:PGdkPixmap; mask:PGdkBitmap);cdecl;external gtkdll name 'gtk_drag_source_set_icon'; function gtk_drag_begin(widget:PGtkWidget; targets:PGtkTargetList; actions:TGdkDragAction; button:gint; event:PGdkEvent):PGdkDragContext;cdecl;external gtkdll name 'gtk_drag_begin'; procedure gtk_drag_set_icon_widget(context:PGdkDragContext; widget:PGtkWidget; hot_x:gint; hot_y:gint);cdecl;external gtkdll name 'gtk_drag_set_icon_widget'; @@ -50,7 +48,10 @@ procedure gtk_drag_dest_handle_event(toplevel:PGtkWidget; event:PGdkEvent);cdecl { $Log$ - Revision 1.2 2002-09-07 15:42:59 peter + 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:42:59 peter * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:10 peter diff --git a/packages/extra/gtk/gtk/gtkmenushell.pp b/packages/extra/gtk/gtk/gtkmenushell.pp index 90bff26b6b..ee9d59ca2b 100644 --- a/packages/extra/gtk/gtk/gtkmenushell.pp +++ b/packages/extra/gtk/gtk/gtkmenushell.pp @@ -81,9 +81,7 @@ procedure gtk_menu_shell_prepend(menu_shell:PGtkMenuShell; child:PGtkWidget);cde procedure gtk_menu_shell_insert(menu_shell:PGtkMenuShell; child:PGtkWidget; position:gint);cdecl;external gtkdll name 'gtk_menu_shell_insert'; procedure gtk_menu_shell_deactivate(menu_shell:PGtkMenuShell);cdecl;external gtkdll name 'gtk_menu_shell_deactivate'; procedure gtk_menu_shell_select_item(menu_shell:PGtkMenuShell; menu_item:PGtkWidget);cdecl;external gtkdll name 'gtk_menu_shell_select_item'; -{$ifndef gtkwin} procedure gtk_menu_shell_deselect(menu_shell:PGtkMenuShell);cdecl;external gtkdll name 'gtk_menu_shell_deselect'; -{$endif} procedure gtk_menu_shell_activate_item(menu_shell:PGtkMenuShell; menu_item:PGtkWidget; force_deactivate:gboolean);cdecl;external gtkdll name 'gtk_menu_shell_activate_item'; {$endif read_interface} @@ -190,7 +188,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:12 peter diff --git a/packages/extra/gtk/gtk/gtkobjects.pp b/packages/extra/gtk/gtk/gtkobjects.pp index 3f3c15bbea..e561ce2559 100644 --- a/packages/extra/gtk/gtk/gtkobjects.pp +++ b/packages/extra/gtk/gtk/gtkobjects.pp @@ -168,9 +168,7 @@ procedure gtk_object_weakref(theobject:PGtkObject; notify:TGtkDestroyNotify; dat procedure gtk_object_weakunref(theobject:PGtkObject; notify:TGtkDestroyNotify; data:gpointer);cdecl;external gtkdll name 'gtk_object_weakunref'; procedure gtk_object_destroy(theobject:PGtkObject);cdecl;external gtkdll name 'gtk_object_destroy'; procedure gtk_object_getv(theobject:PGtkObject; n_args:guint; args:PGtkArg);cdecl;external gtkdll name 'gtk_object_getv'; -{$ifndef gtkwin} procedure gtk_object_get(theobject:PGtkObject; first_arg_name:Pgchar; args:array of const);cdecl;external gtkdll name 'gtk_object_get'; -{$endif} procedure gtk_object_set(theobject:PGtkObject; first_arg_name:Pgchar; args:array of const);cdecl;external gtkdll name 'gtk_object_set'; procedure gtk_object_setv(theobject:PGtkObject; n_args:guint; args:PGtkArg);cdecl;external gtkdll name 'gtk_object_setv'; function gtk_object_query_args(class_type:TGtkType; arg_flags:PPguint32; n_args:Pguint):PGtkArg;cdecl;external gtkdll name 'gtk_object_query_args'; @@ -178,9 +176,7 @@ procedure gtk_object_set_data(theobject:PGtkObject; key:Pgchar; data:gpointer);c procedure gtk_object_set_data_full(theobject:PGtkObject; key:Pgchar; data:gpointer; destroy:TGtkDestroyNotify);cdecl;external gtkdll name 'gtk_object_set_data_full'; procedure gtk_object_remove_data(theobject:PGtkObject; key:Pgchar);cdecl;external gtkdll name 'gtk_object_remove_data'; function gtk_object_get_data(theobject:PGtkObject; key:Pgchar):gpointer;cdecl;external gtkdll name 'gtk_object_get_data'; -{$ifndef gtkwin} procedure gtk_object_remove_no_notify(theobject:PGtkObject; key:Pgchar);cdecl;external gtkdll name 'gtk_object_remove_no_notify'; -{$endif} procedure gtk_object_set_user_data(theobject:PGtkObject; data:gpointer);cdecl;external gtkdll name 'gtk_object_set_user_data'; function gtk_object_get_user_data(theobject:PGtkObject):gpointer;cdecl;external gtkdll name 'gtk_object_get_user_data'; procedure gtk_object_class_add_signals(klass:PGtkObjectClass; signals:Pguint; nsignals:guint);cdecl;external gtkdll name 'gtk_object_class_add_signals'; @@ -264,7 +260,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:12 peter diff --git a/packages/extra/gtk/gtk/gtkplug.pp b/packages/extra/gtk/gtk/gtkplug.pp index a8185673c3..b28079707a 100644 --- a/packages/extra/gtk/gtk/gtkplug.pp +++ b/packages/extra/gtk/gtk/gtkplug.pp @@ -25,11 +25,9 @@ type GTK_PLUG=PGtkPlug; GTK_PLUG_CLASS=PGtkPlugClass; -{$ifndef gtkwin} function gtk_plug_get_type:guint;cdecl;external gtkdll name 'gtk_plug_get_type'; procedure gtk_plug_construct(plug:PGtkPlug; socket_id:guint32);cdecl;external gtkdll name 'gtk_plug_construct'; function gtk_plug_new(socket_id:guint32):PGtkWidget;cdecl;external gtkdll name 'gtk_plug_new'; -{$endif} {$endif read_interface} @@ -44,7 +42,10 @@ function gtk_plug_new(socket_id:guint32):PGtkWidget;cdecl;external gtkdll name { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:12 peter diff --git a/packages/extra/gtk/gtk/gtkrc.pp b/packages/extra/gtk/gtk/gtkrc.pp index efefff1baf..137e491858 100644 --- a/packages/extra/gtk/gtk/gtkrc.pp +++ b/packages/extra/gtk/gtk/gtkrc.pp @@ -22,7 +22,6 @@ function gtk_rc_get_style(widget:PGtkWidget):PGtkStyle;cdecl;external gtkdll na procedure gtk_rc_add_widget_name_style(rc_style:PGtkRcStyle; pattern:Pgchar);cdecl;external gtkdll name 'gtk_rc_add_widget_name_style'; procedure gtk_rc_add_widget_class_style(rc_style:PGtkRcStyle; pattern:Pgchar);cdecl;external gtkdll name 'gtk_rc_add_widget_class_style'; procedure gtk_rc_add_class_style(rc_style:PGtkRcStyle; pattern:Pgchar);cdecl;external gtkdll name 'gtk_rc_add_class_style'; -{$ifndef gtkwin} function gtk_rc_style_new:PGtkRcStyle;cdecl;external gtkdll name 'gtk_rc_style_new'; procedure gtk_rc_style_ref(rc_style:PGtkRcStyle);cdecl;external gtkdll name 'gtk_rc_style_ref'; procedure gtk_rc_style_unref(rc_style:PGtkRcStyle);cdecl;external gtkdll name 'gtk_rc_style_unref'; @@ -57,7 +56,6 @@ function gtk_rc_get_module_dir:Pgchar;cdecl;external gtkdll name 'gtk_rc_get_mo function gtk_rc_parse_color(scanner:PGScanner; color:PGdkColor):guint;cdecl;external gtkdll name 'gtk_rc_parse_color'; function gtk_rc_parse_state(scanner:PGScanner; state:PGtkStateType):guint;cdecl;external gtkdll name 'gtk_rc_parse_state'; function gtk_rc_parse_priority(scanner:PGScanner; priority:PGtkPathPriorityType):guint;cdecl;external gtkdll name 'gtk_rc_parse_priority'; -{$endif} {$endif read_interface} @@ -72,7 +70,10 @@ function gtk_rc_parse_priority(scanner:PGScanner; priority:PGtkPathPriorityType { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:13 peter diff --git a/packages/extra/gtk/gtk/gtkscale.pp b/packages/extra/gtk/gtk/gtkscale.pp index 50fc5d45a7..6c1fb03bfb 100644 --- a/packages/extra/gtk/gtk/gtkscale.pp +++ b/packages/extra/gtk/gtk/gtkscale.pp @@ -46,9 +46,9 @@ function gtk_scale_get_type:TGtkType;cdecl;external gtkdll name 'gtk_scale_get_ procedure gtk_scale_set_digits(scale:PGtkScale; digits:gint);cdecl;external gtkdll name 'gtk_scale_set_digits'; procedure gtk_scale_set_draw_value(scale:PGtkScale; draw_value:gboolean);cdecl;external gtkdll name 'gtk_scale_set_draw_value'; 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} function gtk_scale_value_width(scale:PGtkScale):gint;cdecl;external gtkdll name 'gtk_scale_value_width'; -procedure gtk_scale_draw_value(scale:PGtkScale);cdecl;external gtkdll name 'gtk_scale_draw_value'; {$endif} {$endif read_interface} @@ -95,7 +95,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:13 peter diff --git a/packages/extra/gtk/gtk/gtkselection.pp b/packages/extra/gtk/gtk/gtkselection.pp index ccc80f1aff..4e354a27cc 100644 --- a/packages/extra/gtk/gtk/gtkselection.pp +++ b/packages/extra/gtk/gtk/gtkselection.pp @@ -29,10 +29,10 @@ info : guint; end; -{$ifndef gtkwin} function gtk_target_list_new(targets:PGtkTargetEntry; ntargets:guint):PGtkTargetList;cdecl;external gtkdll name 'gtk_target_list_new'; -procedure gtk_target_list_ref(list:PGtkTargetList);cdecl;external gtkdll name 'gtk_target_list_ref'; procedure gtk_target_list_unref(list:PGtkTargetList);cdecl;external gtkdll name 'gtk_target_list_unref'; +{$ifndef gtkwin} +procedure gtk_target_list_ref(list:PGtkTargetList);cdecl;external gtkdll name 'gtk_target_list_ref'; procedure gtk_target_list_add(list:PGtkTargetList; target:TGdkAtom; flags:guint; info:guint);cdecl;external gtkdll name 'gtk_target_list_add'; procedure gtk_target_list_add_table(list:PGtkTargetList; targets:PGtkTargetEntry; ntargets:guint);cdecl;external gtkdll name 'gtk_target_list_add_table'; procedure gtk_target_list_remove(list:PGtkTargetList; target:TGdkAtom);cdecl;external gtkdll name 'gtk_target_list_remove'; @@ -65,7 +65,10 @@ procedure gtk_selection_data_free(data:PGtkSelectionData);cdecl;external gtkdll { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:13 peter diff --git a/packages/extra/gtk/gtk/gtksocket.pp b/packages/extra/gtk/gtk/gtksocket.pp index e72fa3e6b8..70ee793970 100644 --- a/packages/extra/gtk/gtk/gtksocket.pp +++ b/packages/extra/gtk/gtk/gtksocket.pp @@ -48,11 +48,9 @@ type GTK_SOCKET=PGtkSocket; GTK_SOCKET_CLASS=PGtkSocket; -{$ifndef gtkwin} function gtk_socket_new:PGtkWidget;cdecl;external gtkdll name 'gtk_socket_new'; function gtk_socket_get_type:guint;cdecl;external gtkdll name 'gtk_socket_get_type'; procedure gtk_socket_steal(socket:PGtkSocket; wid:guint32);cdecl;external gtkdll name 'gtk_socket_steal'; -{$endif} {$endif read_interface} @@ -108,7 +106,10 @@ procedure set_need_map(var a : TGtkSocket; __need_map : guint); { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:13 peter diff --git a/packages/extra/gtk/gtk/gtktext.pp b/packages/extra/gtk/gtk/gtktext.pp index 5297d0a232..86f15fae19 100644 --- a/packages/extra/gtk/gtk/gtktext.pp +++ b/packages/extra/gtk/gtk/gtktext.pp @@ -104,9 +104,7 @@ function gtk_text_get_type:TGtkType;cdecl;external gtkdll name 'gtk_text_get_ty function gtk_text_new(hadj:PGtkAdjustment; vadj:PGtkAdjustment):PGtkWidget;cdecl;external gtkdll name 'gtk_text_new'; procedure gtk_text_set_editable(text:PGtkText; editable:gboolean);cdecl;external gtkdll name 'gtk_text_set_editable'; procedure gtk_text_set_word_wrap(text:PGtkText; word_wrap:gint);cdecl;external gtkdll name 'gtk_text_set_word_wrap'; -{$ifndef gtkwin} procedure gtk_text_set_line_wrap(text:PGtkText; line_wrap:gint);cdecl;external gtkdll name 'gtk_text_set_line_wrap'; -{$endif} procedure gtk_text_set_adjustments(text:PGtkText; hadj:PGtkAdjustment; vadj:PGtkAdjustment);cdecl;external gtkdll name 'gtk_text_set_adjustments'; procedure gtk_text_set_point(text:PGtkText; index:guint);cdecl;external gtkdll name 'gtk_text_set_point'; function gtk_text_get_point(text:PGtkText):guint;cdecl;external gtkdll name 'gtk_text_get_point'; @@ -189,7 +187,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:13 peter diff --git a/packages/extra/gtk/gtk/gtktree.pp b/packages/extra/gtk/gtk/gtktree.pp index 3ed3b5c3b5..007f1789ac 100644 --- a/packages/extra/gtk/gtk/gtktree.pp +++ b/packages/extra/gtk/gtk/gtktree.pp @@ -74,9 +74,7 @@ function gtk_tree_child_position(tree:PGtkTree; child:PGtkWidget):gint;cdecl;ex procedure gtk_tree_set_selection_mode(tree:PGtkTree; mode:TGtkSelectionMode);cdecl;external gtkdll name 'gtk_tree_set_selection_mode'; procedure gtk_tree_set_view_mode(tree:PGtkTree; mode:TGtkTreeViewMode);cdecl;external gtkdll name 'gtk_tree_set_view_mode'; procedure gtk_tree_set_view_lines(tree:PGtkTree; flag:guint);cdecl;external gtkdll name 'gtk_tree_set_view_lines'; -{$ifndef win32} procedure gtk_tree_remove_item(tree:PGtkTree; child:PGtkWidget);cdecl;external gtkdll name 'gtk_tree_remove_item'; -{$endif} {$endif read_interface} @@ -140,7 +138,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:14 peter diff --git a/packages/extra/gtk/gtk/gtktypeutils.pp b/packages/extra/gtk/gtk/gtktypeutils.pp index e819040e5d..eedb8b9f90 100644 --- a/packages/extra/gtk/gtk/gtktypeutils.pp +++ b/packages/extra/gtk/gtk/gtktypeutils.pp @@ -148,9 +148,7 @@ function gtk_type_enum_find_value(enum_thetype:TGtkType; value_name:Pgchar):PGt function gtk_type_flags_find_value(flag_thetype:TGtkType; value_name:Pgchar):PGtkFlagValue;cdecl;external gtkdll name 'gtk_type_flags_find_value'; procedure gtk_type_set_varargs_type(foreign_thetype:TGtkType; varargs_thetype:TGtkType);cdecl;external gtkdll name 'gtk_type_set_varargs_type'; function gtk_type_get_varargs_type(foreign_thetype:TGtkType):TGtkType;cdecl;external gtkdll name 'gtk_type_get_varargs_type'; -{$ifndef gtkwin} function gtk_type_query(thetype:TGtkType):PGtkTypeQuery;cdecl;external gtkdll name 'gtk_type_query'; -{$endif} {$endif read_interface} @@ -361,7 +359,10 @@ function GTK_RETLOC_POINTER(const a : TGtkArg) : Pgpointer; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:14 peter diff --git a/packages/extra/gtk/gtk/gtkwidget.pp b/packages/extra/gtk/gtk/gtkwidget.pp index fb1fc3049d..67fa21d8ef 100644 --- a/packages/extra/gtk/gtk/gtkwidget.pp +++ b/packages/extra/gtk/gtk/gtkwidget.pp @@ -323,11 +323,9 @@ procedure gtk_widget_unmap(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_wi procedure gtk_widget_realize(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_realize'; procedure gtk_widget_unrealize(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_unrealize'; procedure gtk_widget_queue_draw(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_queue_draw'; -{$ifndef gtkwin} procedure gtk_widget_queue_draw_area(widget:PGtkWidget; x:gint; y:gint; width:gint; height:gint);cdecl;external gtkdll name 'gtk_widget_queue_draw_area'; procedure gtk_widget_queue_clear(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_queue_clear'; procedure gtk_widget_queue_clear_area(widget:PGtkWidget; x:gint; y:gint; width:gint; height:gint);cdecl;external gtkdll name 'gtk_widget_queue_clear_area'; -{$endif} procedure gtk_widget_queue_resize(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_queue_resize'; procedure gtk_widget_draw(widget:PGtkWidget; area:PGdkRectangle);cdecl;external gtkdll name 'gtk_widget_draw'; procedure gtk_widget_draw_focus(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_draw_focus'; @@ -341,9 +339,7 @@ procedure gtk_widget_remove_accelerators(widget:PGtkWidget; accel_signal:Pgchar; function gtk_widget_accelerator_signal(widget:PGtkWidget; accel_group:PGtkAccelGroup; accel_key:guint; accel_mods:guint):guint;cdecl;external gtkdll name 'gtk_widget_accelerator_signal'; procedure gtk_widget_lock_accelerators(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_lock_accelerators'; procedure gtk_widget_unlock_accelerators(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_unlock_accelerators'; -{$ifndef gtkwin} function gtk_widget_accelerators_locked(widget:PGtkWidget):gboolean;cdecl;external gtkdll name 'gtk_widget_accelerators_locked'; -{$endif} function gtk_widget_event(widget:PGtkWidget; event:PGdkEvent):gint;cdecl;external gtkdll name 'gtk_widget_event'; function gtk_widget_activate(widget:PGtkWidget):gboolean;cdecl;external gtkdll name 'gtk_widget_activate'; function gtk_widget_set_scroll_adjustments(widget:PGtkWidget; hadjustment:PGtkAdjustment; vadjustment:PGtkAdjustment):gboolean;cdecl;external gtkdll name 'gtk_widget_set_scroll_adjustments'; @@ -356,18 +352,14 @@ procedure gtk_widget_set_name(widget:PGtkWidget; name:Pgchar);cdecl;external gtk function gtk_widget_get_name (widget:PGtkWidget):Pgchar;cdecl;external gtkdll name 'gtk_widget_get_name'; procedure gtk_widget_set_state(widget:PGtkWidget; state:TGtkStateType);cdecl;external gtkdll name 'gtk_widget_set_state'; procedure gtk_widget_set_sensitive(widget:PGtkWidget; sensitive:gboolean);cdecl;external gtkdll name 'gtk_widget_set_sensitive'; -{$ifndef gtkwin} procedure gtk_widget_set_app_paintable(widget:PGtkWidget; app_paintable:gboolean);cdecl;external gtkdll name 'gtk_widget_set_app_paintable'; -{$endif} procedure gtk_widget_set_parent(widget:PGtkWidget; parent:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_set_parent'; procedure gtk_widget_set_parent_window(widget:PGtkWidget; parent_window:PGdkWindow);cdecl;external gtkdll name 'gtk_widget_set_parent_window'; function gtk_widget_get_parent_window (widget:PGtkWidget):PGdkWindow;cdecl;external gtkdll name 'gtk_widget_get_parent_window'; procedure gtk_widget_set_uposition(widget:PGtkWidget; x:gint; y:gint);cdecl;external gtkdll name 'gtk_widget_set_uposition'; procedure gtk_widget_set_usize(widget:PGtkWidget; width:gint; height:gint);cdecl;external gtkdll name 'gtk_widget_set_usize'; procedure gtk_widget_set_events(widget:PGtkWidget; events:gint);cdecl;external gtkdll name 'gtk_widget_set_events'; -{$ifndef gtkwin} procedure gtk_widget_add_events(widget:PGtkWidget; events:gint);cdecl;external gtkdll name 'gtk_widget_add_events'; -{$endif} procedure gtk_widget_set_extension_events(widget:PGtkWidget; mode:TGdkExtensionMode);cdecl;external gtkdll name 'gtk_widget_set_extension_events'; function gtk_widget_get_extension_events(widget:PGtkWidget):TGdkExtensionMode;cdecl;external gtkdll name 'gtk_widget_get_extension_events'; function gtk_widget_get_toplevel (widget:PGtkWidget):PGtkWidget;cdecl;external gtkdll name 'gtk_widget_get_toplevel'; @@ -385,19 +377,15 @@ procedure gtk_widget_set_rc_style(widget:PGtkWidget);cdecl;external gtkdll name procedure gtk_widget_ensure_style(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_ensure_style'; function gtk_widget_get_style (widget:PGtkWidget):PGtkStyle;cdecl;external gtkdll name 'gtk_widget_get_style'; procedure gtk_widget_restore_default_style(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_restore_default_style'; -{$ifndef gtkwin} procedure gtk_widget_modify_style(widget:PGtkWidget; style:PGtkRcStyle);cdecl;external gtkdll name 'gtk_widget_modify_style'; procedure gtk_widget_set_composite_name(widget:PGtkWidget; name:Pgchar);cdecl;external gtkdll name 'gtk_widget_set_composite_name'; function gtk_widget_get_composite_name(widget:PGtkWidget):Pgchar;cdecl;external gtkdll name 'gtk_widget_get_composite_name'; -{$endif} procedure gtk_widget_reset_rc_styles(widget:PGtkWidget);cdecl;external gtkdll name 'gtk_widget_reset_rc_styles'; procedure gtk_widget_push_style(style:PGtkStyle);cdecl;external gtkdll name 'gtk_widget_push_style'; procedure gtk_widget_push_colormap(cmap:PGdkColormap);cdecl;external gtkdll name 'gtk_widget_push_colormap'; procedure gtk_widget_push_visual(visual:PGdkVisual);cdecl;external gtkdll name 'gtk_widget_push_visual'; -{$ifndef gtkwin} procedure gtk_widget_push_composite_child;cdecl;external gtkdll name 'gtk_widget_push_composite_child'; procedure gtk_widget_pop_composite_child;cdecl;external gtkdll name 'gtk_widget_pop_composite_child'; -{$endif} procedure gtk_widget_pop_style;cdecl;external gtkdll name 'gtk_widget_pop_style'; procedure gtk_widget_pop_colormap;cdecl;external gtkdll name 'gtk_widget_pop_colormap'; procedure gtk_widget_pop_visual;cdecl;external gtkdll name 'gtk_widget_pop_visual'; @@ -550,7 +538,10 @@ end; { $Log$ - Revision 1.3 2002-10-31 08:03:39 michael + Revision 1.4 2003-08-06 07:28:21 michael + + Patch from Marc Weustinck to fix Win32 version + + Revision 1.3 2002/10/31 08:03:39 michael + Added some missing methods Revision 1.2 2002/09/07 15:43:00 peter diff --git a/packages/extra/gtk/gtk/gtkwindow.pp b/packages/extra/gtk/gtk/gtkwindow.pp index 21d4eea2eb..b07d6d019a 100644 --- a/packages/extra/gtk/gtk/gtkwindow.pp +++ b/packages/extra/gtk/gtk/gtkwindow.pp @@ -85,10 +85,8 @@ procedure gtk_window_set_default_size(window:PGtkWindow; width:gint; height:gint procedure gtk_window_set_modal(window:PGtkWindow; modal:gboolean);cdecl;external gtkdll name 'gtk_window_set_modal'; procedure gtk_window_set_focus(window:PGtkWindow; focus:PGtkWidget);cdecl;external gtkdll name 'gtk_window_set_focus'; procedure gtk_window_set_default(window:PGtkWindow; defaultw:PGtkWidget);cdecl;external gtkdll name 'gtk_window_set_default'; -{$ifndef gtkwin} procedure gtk_window_remove_embedded_xid(window:PGtkWindow; xid:guint);cdecl;external gtkdll name 'gtk_window_remove_embedded_xid'; procedure gtk_window_add_embedded_xid(window:PGtkWindow; xid:guint);cdecl;external gtkdll name 'gtk_window_add_embedded_xid'; -{$endif} {$endif read_interface} @@ -183,7 +181,10 @@ end; { $Log$ - Revision 1.2 2002-09-07 15:43:00 peter + 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 * old logs removed and tabs fixed Revision 1.1 2002/01/29 17:55:16 peter