* win32 updates from vincent snijder

packages/gtk/gdk/gdkmain.pp

@@ -70,6 +70,9 @@ procedure gdk_window_destroy(window:PGdkWindow);cdecl;external gdkdll name 'gdk_
 {$ifndef win32}
 function  gdk_window_ref(window:PGdkWindow):PGdkWindow;cdecl;external gdkdll name 'gdk_window_ref';
 procedure gdk_window_unref(window:PGdkWindow);cdecl;external gdkdll name 'gdk_window_unref';
+{$else}
+function  gdk_window_ref(window:PGdkWindow):PGdkWindow;cdecl;external gdkdll name 'gdk_drawable_ref';
+procedure gdk_window_unref(window:PGdkWindow);cdecl;external gdkdll name 'gdk_drawable_unref';
 {$endif}
 function  gdk_window_at_pointer(win_x:Pgint; win_y:Pgint):PGdkWindow;cdecl;external gdkdll name 'gdk_window_at_pointer';
 procedure gdk_window_show(window:PGdkWindow);cdecl;external gdkdll name 'gdk_window_show';
@@ -110,8 +113,8 @@ function  gdk_drag_get_selection(context:PGdkDragContext):TGdkAtom;cdecl;externa
 function  gdk_drag_begin(window:PGdkWindow; targets:PGList):PGdkDragContext;cdecl;external gdkdll name 'gdk_drag_begin';
 function  gdk_drag_get_protocol(xid:guint32; protocol:PGdkDragProtocol):guint32;cdecl;external gdkdll name 'gdk_drag_get_protocol';
 procedure gdk_drag_find_window(context:PGdkDragContext; drag_window:PGdkWindow; x_root:gint; y_root:gint; dest_window:PPGdkWindow;protocol:PGdkDragProtocol);cdecl;external gdkdll name 'gdk_drag_find_window';
-function  gdk_drag_motion(context:PGdkDragContext; dest_window:PGdkWindow; protocol:TGdkDragProtocol; x_root:gint; y_root:gint;suggested_action:TGdkDragAction; possible_actions:TGdkDragAction; time:guint32):gboolean;cdecl;external gdkdll name 'gdk_drag_motion';
-procedure gdk_drag_drop(context:PGdkDragContext; time:guint32);cdecl;external gdkdll name 'gdk_drag_drop';
+function  gdk_drag_motion(context:PGdkDragContext; dest_window:PGdkWindow; protocol:TGdkDragProtocol; x_root:gint; y_root:gint;suggested_action:TGdkDragAction; possible_actions:TGdkDragAction; time:guint32):gboolean;cdecl;
+    external gdkdll name 'gdk_drag_motion';
 procedure gdk_drag_abort(context:PGdkDragContext; time:guint32);cdecl;external gdkdll name 'gdk_drag_abort';
 procedure gdk_window_set_hints(window:PGdkWindow; x:gint; y:gint; min_width:gint; min_height:gint; max_width:gint; max_height:gint; flags:gint);cdecl;external gdkdll name 'gdk_window_set_hints';
 procedure gdk_window_set_geometry_hints(window:PGdkWindow; geometry:PGdkGeometry; flags:TGdkWindowHints);cdecl;external gdkdll name 'gdk_window_set_geometry_hints';
@@ -124,13 +127,22 @@ procedure gdk_window_set_transient_for(window:PGdkWindow; leader:PGdkWindow);cde
 procedure gdk_window_set_background(window:PGdkWindow; color:PGdkColor);cdecl;external gdkdll name 'gdk_window_set_background';
 procedure gdk_window_set_back_pixmap(window:PGdkWindow; pixmap:PGdkPixmap; parent_relative:gint);cdecl;external gdkdll name 'gdk_window_set_back_pixmap';
 procedure gdk_window_set_cursor(window:PGdkWindow; cursor:PGdkCursor);cdecl;external gdkdll name 'gdk_window_set_cursor';
-{$ifndef win32}
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+procedure gdk_window_set_colormap(window:PGdkWindow; colormap:PGdkColormap);cdecl;external gdkdll name 'gdk_drawable_set_colormap';
+{$else}
 procedure gdk_window_set_colormap(window:PGdkWindow; colormap:PGdkColormap);cdecl;external gdkdll name 'gdk_window_set_colormap';
 {$endif}
 procedure gdk_window_get_user_data(window:PGdkWindow; data:Pgpointer);cdecl;external gdkdll name 'gdk_window_get_user_data';
 procedure gdk_window_get_geometry(window:PGdkWindow; x:Pgint; y:Pgint; width:Pgint; height:Pgint; depth:Pgint);cdecl;external gdkdll name 'gdk_window_get_geometry';
 procedure gdk_window_get_position(window:PGdkWindow; x:Pgint; y:Pgint);cdecl;external gdkdll name 'gdk_window_get_position';
-{$ifndef win32}
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+procedure gdk_window_get_size(window:PGdkWindow; width:Pgint; height:Pgint);cdecl;external gdkdll name 'gdk_drawable_get_size';
+function  gdk_window_get_visual(window:PGdkWindow):PGdkVisual;cdecl;external gdkdll name 'gdk_drawable_get_visual';
+function  gdk_window_get_colormap(window:PGdkWindow):PGdkColormap;cdecl;external gdkdll name 'gdk_drawable_get_colormap';
+function  gdk_window_get_type(window:PGdkWindow):TGdkWindowType;cdecl;external gdkdll name 'gdk_drawable_get_type';
+{$else}
 procedure gdk_window_get_size(window:PGdkWindow; width:Pgint; height:Pgint);cdecl;external gdkdll name 'gdk_window_get_size';
 function  gdk_window_get_visual(window:PGdkWindow):PGdkVisual;cdecl;external gdkdll name 'gdk_window_get_visual';
 function  gdk_window_get_colormap(window:PGdkWindow):PGdkColormap;cdecl;external gdkdll name 'gdk_window_get_colormap';
@@ -155,12 +167,20 @@ procedure gdk_window_register_dnd(window:PGdkWindow);cdecl;external gdkdll name
 procedure gdk_drawable_set_data(drawable:PGdkDrawable; key:Pgchar; data:gpointer; destroy_func:TGDestroyNotify);cdecl;external gdkdll name 'gdk_drawable_set_data';
 function  gdk_cursor_new(cursor_type:TGdkCursorType):PGdkCursor;cdecl;external gdkdll name 'gdk_cursor_new';
 function  gdk_cursor_new_from_pixmap(source:PGdkPixmap; mask:PGdkPixmap; fg:PGdkColor; bg:PGdkColor; x:gint; y:gint):PGdkCursor;cdecl;external gdkdll name 'gdk_cursor_new_from_pixmap';
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+procedure gdk_cursor_destroy(cursor:PGdkCursor);cdecl;external gdkdll name 'gdk_cursor_unref';
+{$else}
 procedure gdk_cursor_destroy(cursor:PGdkCursor);cdecl;external gdkdll name 'gdk_cursor_destroy';
+{$endif}
 function  gdk_gc_new(window:PGdkWindow):PGdkGC;cdecl;external gdkdll name 'gdk_gc_new';
 function  gdk_gc_new_with_values(window:PGdkWindow; values:PGdkGCValues; values_mask:TGdkGCValuesMask):PGdkGC;cdecl;external gdkdll name 'gdk_gc_new_with_values';
 function  gdk_gc_ref(gc:PGdkGC):PGdkGC;cdecl;external gdkdll name 'gdk_gc_ref';
 procedure gdk_gc_unref(gc:PGdkGC);cdecl;external gdkdll name 'gdk_gc_unref';
-{$ifndef win32}
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+procedure gdk_gc_destroy(gc:PGdkGC);cdecl;external gdkdll name 'gdk_gc_unref';
+{$else}
 procedure gdk_gc_destroy(gc:PGdkGC);cdecl;external gdkdll name 'gdk_gc_destroy';
 {$endif}
 procedure gdk_gc_get_values(gc:PGdkGC; values:PGdkGCValues);cdecl;external gdkdll name 'gdk_gc_get_values';
@@ -188,7 +208,13 @@ function  gdk_pixmap_create_from_xpm(window:PGdkWindow; mask:PPGdkBitmap; transp
 function  gdk_pixmap_colormap_create_from_xpm(window:PGdkWindow; colormap:PGdkColormap; mask:PPGdkBitmap; transparent_color:PGdkColor; filename:Pgchar):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_colormap_create_from_xpm';
 function  gdk_pixmap_create_from_xpm_d(window:PGdkWindow; mask:PPGdkBitmap; transparent_color:PGdkColor; data:PPgchar):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_create_from_xpm_d';
 function  gdk_pixmap_colormap_create_from_xpm_d(window:PGdkWindow; colormap:PGdkColormap; mask:PPGdkBitmap; transparent_color:PGdkColor; data:PPgchar):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_colormap_create_from_xpm_d';
-{$ifndef win32}
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+function  gdk_pixmap_ref(pixmap:PGdkPixmap):PGdkPixmap;cdecl;external gdkdll name 'gdk_drawable_ref';
+procedure gdk_pixmap_unref(pixmap:PGdkPixmap);cdecl;external gdkdll name 'gdk_drawable_unref';
+function  gdk_bitmap_ref(pixmap:PGdkBitmap):PGdkBitmap;cdecl;external gdkdll name 'gdk_drawable_ref';
+procedure gdk_bitmap_unref(pixmap:PGdkBitmap);cdecl;external gdkdll name 'gdk_drawable_unref';
+{$else}
 function  gdk_pixmap_ref(pixmap:PGdkPixmap):PGdkPixmap;cdecl;external gdkdll name 'gdk_pixmap_ref';
 procedure gdk_pixmap_unref(pixmap:PGdkPixmap);cdecl;external gdkdll name 'gdk_pixmap_unref';
 function  gdk_bitmap_ref(pixmap:PGdkBitmap):PGdkBitmap;cdecl;external gdkdll name 'gdk_bitmap_ref';
@@ -199,7 +225,10 @@ function  gdk_image_new(thetype:TGdkImageType; visual:PGdkVisual; width:gint; he
 function  gdk_image_get(window:PGdkWindow; x:gint; y:gint; width:gint; height:gint):PGdkImage;cdecl;external gdkdll name 'gdk_image_get';
 procedure gdk_image_put_pixel(image:PGdkImage; x:gint; y:gint; pixel:guint32);cdecl;external gdkdll name 'gdk_image_put_pixel';
 function  gdk_image_get_pixel(image:PGdkImage; x:gint; y:gint):guint32;cdecl;external gdkdll name 'gdk_image_get_pixel';
-{$ifndef win32}
+{$ifdef win32}
+{In gtk 1.3 these functions have been renamed/replaced.}
+procedure gdk_image_destroy(image:PGdkImage);cdecl;external gdkdll name 'gdk_image_unref';
+{$else}
 procedure gdk_image_destroy(image:PGdkImage);cdecl;external gdkdll name 'gdk_image_destroy';
 {$endif}
 function  gdk_colormap_new(visual:PGdkVisual; allocate:gint):PGdkColormap;cdecl;external gdkdll name 'gdk_colormap_new';
@@ -252,7 +281,11 @@ procedure gdk_draw_polygon(drawable:PGdkDrawable; gc:PGdkGC; filled:gint; points
 procedure gdk_draw_string(drawable:PGdkDrawable; font:PGdkFont; gc:PGdkGC; x:gint; y:gint; thestring:Pgchar);cdecl;external gdkdll name 'gdk_draw_string';
 procedure gdk_draw_text(drawable:PGdkDrawable; font:PGdkFont; gc:PGdkGC; x:gint; y:gint; text:Pgchar; text_length:gint);cdecl;external gdkdll name 'gdk_draw_text';
 procedure gdk_draw_text_wc(drawable:PGdkDrawable; font:PGdkFont; gc:PGdkGC; x:gint; y:gint; text:PGdkWChar; text_length:gint);cdecl;external gdkdll name 'gdk_draw_text_wc';
-{$ifndef gtkwin}
+{$ifdef gtkwin}
+{In gtk 1.3 these functions have been renamed/replaced.}
+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_drawable';
+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';
 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}
@@ -271,7 +304,8 @@ function  gdk_string_to_compound_text(str:Pgchar; encoding:PTGdkAtom; format:Pgi
 procedure gdk_free_compound_text(ctext:Pguchar);cdecl;external gdkdll name 'gdk_free_compound_text';
 function  gdk_atom_intern(atom_name:Pgchar; only_if_exists:gint):TGdkAtom;cdecl;external gdkdll name 'gdk_atom_intern';
 function  gdk_atom_name(atom:TGdkAtom):Pgchar;cdecl;external gdkdll name 'gdk_atom_name';
-function  gdk_property_get(window:PGdkWindow; theproperty:TGdkAtom; thetype:TGdkAtom; offset:gulong; length:gulong; pdelete:gint; actual_property_type:PTGdkAtom; actual_format:Pgint; actual_length:Pgint; data:PPguchar):gint;cdecl;external gdkdll name 'gdk_property_get';
+function  gdk_property_get(window:PGdkWindow; theproperty:TGdkAtom; thetype:TGdkAtom; offset:gulong; length:gulong; pdelete:gint; actual_property_type:PTGdkAtom; actual_format:Pgint; actual_length:Pgint; data:PPguchar):gint;cdecl;
+   external gdkdll name 'gdk_property_get';
 procedure gdk_property_change(window:PGdkWindow; theproperty:TGdkAtom; thetype:TGdkAtom; format:gint; mode:TGdkPropMode; data:Pguchar; nelements:gint);cdecl;external gdkdll name 'gdk_property_change';
 procedure gdk_property_delete(window:PGdkWindow; theproperty:TGdkAtom);cdecl;external gdkdll name 'gdk_property_delete';
 function  gdk_rectangle_intersect(src1:PGdkRectangle; src2:PGdkRectangle; dest:PGdkRectangle):gint;cdecl;external gdkdll name 'gdk_rectangle_intersect';
@@ -355,7 +389,10 @@ procedure gdk_threads_leave;cdecl;external gdkdll name 'gdk_threads_leave';
 
 {
   $Log$
-  Revision 1.3  2000-01-26 19:16:24  lazarus
+  Revision 1.4  2000-02-14 19:18:58  peter
+    * win32 updates from vincent snijder
+
+  Revision 1.3  2000/01/26 19:16:24  lazarus
   Implemented TPen.Style properly for GTK. Done SelectObject for pen objects.
   Misc bug fixes.
   Corrected GDK declaration for gdk_gc_set_slashes.
@@ -400,4 +437,3 @@ procedure gdk_threads_leave;cdecl;external gdkdll name 'gdk_threads_leave';
     * gtk.pp,gdk.pp for an all in one unit
 
 }
-

packages/gtk/gtk/gtkmain.pp

@@ -34,9 +34,7 @@ function  gtk_init_check(argc:plongint; argv:pppchar):gboolean;cdecl;external gt
 procedure gtk_exit(error_code:gint);cdecl;external gtkdll name 'gtk_exit';
 function  gtk_set_locale:Pgchar;cdecl;external gtkdll name 'gtk_set_locale';
 function  gtk_events_pending:gint;cdecl;external gtkdll name 'gtk_events_pending';
-{$ifndef gtkwin}
 procedure gtk_main_do_event(event:PGdkEvent);cdecl;external gtkdll name 'gtk_main_do_event';
-{$endif}
 procedure gtk_main;cdecl;external gtkdll name 'gtk_main';
 function  gtk_main_level:guint;cdecl;external gtkdll name 'gtk_main_level';
 procedure gtk_main_quit;cdecl;external gtkdll name 'gtk_main_quit';
@@ -84,7 +82,10 @@ procedure gtk_propagate_event(widget:PGtkWidget; event:PGdkEvent);cdecl;external
 
 {
   $Log$
-  Revision 1.1  1999-11-24 23:36:36  peter
+  Revision 1.2  2000-02-14 19:18:58  peter
+    * win32 updates from vincent snijder
+
+  Revision 1.1  1999/11/24 23:36:36  peter
     * moved to packages dir
 
   Revision 1.9  1999/10/06 17:42:49  peter

packages/gtk/gtk/gtkmarshal.pp

@@ -8,57 +8,85 @@
 
 {$ifdef read_interface}
 
-{$ifndef gtkwin}
 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';
 procedure gtk_marshal_BOOL__POINTER_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_BOOL__POINTER_INT_INT_UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_INT_INT_UINT';
+{$endif}
 procedure gtk_marshal_BOOL__POINTER_INT_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_INT_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER';
+{$endif}
 procedure gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER';
+{$ifndef gtkwin}
 procedure gtk_marshal_ENUM__ENUM(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_ENUM__ENUM';
+{$endif}
 procedure gtk_marshal_INT__INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_INT__INT';
 procedure gtk_marshal_INT__POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_INT__POINTER';
 procedure gtk_marshal_INT__POINTER_CHAR_CHAR(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_INT__POINTER_CHAR_CHAR';
 procedure gtk_marshal_NONE__BOOL(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__BOOL';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__BOXED(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__BOXED';
+{$endif}
 procedure gtk_marshal_NONE__POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER';
 procedure gtk_marshal_NONE__C_CALLBACK(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__C_CALLBACK';
 procedure gtk_marshal_NONE__C_CALLBACK_C_CALLBACK(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__C_CALLBACK_C_CALLBACK';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__ENUM(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__ENUM';
+{$endif}
 procedure gtk_marshal_NONE__INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__ENUM_FLOAT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__ENUM_FLOAT';
+{$endif}
 procedure gtk_marshal_NONE__INT_FLOAT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_FLOAT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__ENUM_FLOAT_BOOL(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__ENUM_FLOAT_BOOL';
+{$endif}
 procedure gtk_marshal_NONE__INT_FLOAT_BOOL(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_FLOAT_BOOL';
 procedure gtk_marshal_NONE__INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_INT';
 procedure gtk_marshal_NONE__INT_INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_INT_POINTER';
 procedure gtk_marshal_NONE__NONE(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__NONE';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__OBJECT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__OBJECT';
+{$endif}
 procedure gtk_marshal_NONE__POINTER_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_INT';
 procedure gtk_marshal_NONE__POINTER_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_POINTER';
 procedure gtk_marshal_NONE__POINTER_POINTER_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_POINTER_POINTER';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__POINTER_STRING_STRING(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_STRING_STRING';
 procedure gtk_marshal_NONE__POINTER_UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_UINT';
 procedure gtk_marshal_NONE__POINTER_UINT_ENUM(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_UINT_ENUM';
+{$endif}
 procedure gtk_marshal_NONE__POINTER_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__POINTER_POINTER_UINT_UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_POINTER_UINT_UINT';
+{$endif}
 procedure gtk_marshal_NONE__POINTER_POINTER_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_POINTER_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT';
+{$endif}
 procedure gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__POINTER_UINT_UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_UINT_UINT';
 procedure gtk_marshal_NONE__STRING(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__STRING';
 procedure gtk_marshal_NONE__STRING_INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__STRING_INT_POINTER';
+{$endif}
 procedure gtk_marshal_NONE__POINTER_INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__POINTER_INT_POINTER';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__UINT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__UINT';
 procedure gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER';
+{$endif}
 procedure gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM';
+{$endif}
 procedure gtk_marshal_NONE__INT_POINTER_INT_INT_INT(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_POINTER_INT_INT_INT';
+{$ifndef gtkwin}
 procedure gtk_marshal_NONE__UINT_STRING(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__UINT_STRING';
-procedure gtk_marshal_NONE__INT_POINTER(theobject:PGtkObject; func:TGtkSignalFunc; func_data:gpointer; args:PGtkArg);cdecl;external gtkdll name 'gtk_marshal_NONE__INT_POINTER';
 {$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';
 
 {$endif read_interface}
 
@@ -73,7 +101,10 @@ procedure gtk_marshal_NONE__INT_POINTER(theobject:PGtkObject; func:TGtkSignalFun
 
 {
   $Log$
-  Revision 1.1  1999-11-24 23:36:36  peter
+  Revision 1.2  2000-02-14 19:18:58  peter
+    * win32 updates from vincent snijder
+
+  Revision 1.1  1999/11/24 23:36:36  peter
     * moved to packages dir
 
   Revision 1.4  1999/10/06 17:42:49  peter

packages/gtk/gtk/gtkobjects.pp

@@ -170,8 +170,8 @@ procedure gtk_object_destroy(theobject:PGtkObject);cdecl;external gtkdll name 'g
 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';
-procedure gtk_object_set(theobject:PGtkObject; first_arg_name:Pgchar; args:array of const);cdecl;external gtkdll name 'gtk_object_set';
 {$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';
 procedure gtk_object_set_data(theobject:PGtkObject; key:Pgchar; data:gpointer);cdecl;external gtkdll name 'gtk_object_set_data';
@@ -189,9 +189,7 @@ procedure gtk_object_set_data_by_id(theobject:PGtkObject; data_id:TGQuark; data:
 procedure gtk_object_set_data_by_id_full(theobject:PGtkObject; data_id:TGQuark; data:gpointer; destroy:TGtkDestroyNotify);cdecl;external gtkdll name 'gtk_object_set_data_by_id_full';
 function  gtk_object_get_data_by_id(theobject:PGtkObject; data_id:TGQuark):gpointer;cdecl;external gtkdll name 'gtk_object_get_data_by_id';
 procedure gtk_object_remove_data_by_id(theobject:PGtkObject; data_id:TGQuark);cdecl;external gtkdll name 'gtk_object_remove_data_by_id';
-{$ifndef gtkwin}
 procedure gtk_object_remove_no_notify_by_id(theobject:PGtkObject; key_id:TGQuark);cdecl;external gtkdll name 'gtk_object_remove_no_notify_by_id';
-{$endif}
 procedure gtk_object_arg_set(theobject:PGtkObject; arg:PGtkArg; info:PGtkArgInfo);cdecl;external gtkdll name 'gtk_object_arg_set';
 procedure gtk_object_arg_get(theobject:PGtkObject; arg:PGtkArg; info:PGtkArgInfo);cdecl;external gtkdll name 'gtk_object_arg_get';
 function  gtk_object_args_collect(theobject_type:TGtkType; arg_list_p:PPGSList; info_list_p:PPGSList; first_arg_name:Pgchar; var_args:array of const):Pgchar;cdecl;external gtkdll name 'gtk_object_args_collect';
@@ -266,7 +264,10 @@ end;
 
 {
   $Log$
-  Revision 1.1  1999-11-24 23:36:36  peter
+  Revision 1.2  2000-02-14 19:18:58  peter
+    * win32 updates from vincent snijder
+
+  Revision 1.1  1999/11/24 23:36:36  peter
     * moved to packages dir
 
   Revision 1.15  1999/10/06 17:42:49  peter