Browse Source

* gtk win32 fixes

peter 25 năm trước cách đây
mục cha
commit
e5a1288e10
42 tập tin đã thay đổi với 1629 bổ sung166 xóa
  1. 1 1
      packages/gtk/examples/Makefile
  2. 1 1
      packages/gtk/examples/Makefile.fpc
  3. 154 0
      packages/gtk/examples/scribble.pp
  4. 6 3
      packages/gtk/gdk/gdk.pp
  5. 40 4
      packages/gtk/gdk/gdkprivate.pp
  6. 5 2
      packages/gtk/glib/glib.pp
  7. 5 2
      packages/gtk/glib/gmodule.pp
  8. 5 2
      packages/gtk/gtk/gtk.pp
  9. 30 4
      packages/gtk/gtk/gtkaccellabel.pp
  10. 45 4
      packages/gtk/gtk/gtkbindings.pp
  11. 42 5
      packages/gtk/gtk/gtkbox.pp
  12. 59 4
      packages/gtk/gtk/gtkbutton.pp
  13. 66 5
      packages/gtk/gtk/gtkclist.pp
  14. 50 4
      packages/gtk/gtk/gtkcombo.pp
  15. 31 5
      packages/gtk/gtk/gtkctree.pp
  16. 50 4
      packages/gtk/gtk/gtkeditable.pp
  17. 51 5
      packages/gtk/gtk/gtkentry.pp
  18. 50 4
      packages/gtk/gtk/gtkhandlebox.pp
  19. 27 4
      packages/gtk/gtk/gtkitemfactory.pp
  20. 35 4
      packages/gtk/gtk/gtklist.pp
  21. 41 4
      packages/gtk/gtk/gtkmenu.pp
  22. 60 5
      packages/gtk/gtk/gtkmenuitem.pp
  23. 36 5
      packages/gtk/gtk/gtkmenushell.pp
  24. 36 5
      packages/gtk/gtk/gtknotebook.pp
  25. 36 10
      packages/gtk/gtk/gtkpacker.pp
  26. 38 4
      packages/gtk/gtk/gtkpaned.pp
  27. 35 4
      packages/gtk/gtk/gtkpixmap.pp
  28. 38 4
      packages/gtk/gtk/gtkpreview.pp
  29. 27 4
      packages/gtk/gtk/gtkprogress.pp
  30. 38 4
      packages/gtk/gtk/gtkprogressbar.pp
  31. 53 4
      packages/gtk/gtk/gtkrange.pp
  32. 35 4
      packages/gtk/gtk/gtkscrolledwindow.pp
  33. 56 4
      packages/gtk/gtk/gtksignal.pp
  34. 27 4
      packages/gtk/gtk/gtksocket.pp
  35. 38 4
      packages/gtk/gtk/gtkspinbutton.pp
  36. 37 6
      packages/gtk/gtk/gtktable.pp
  37. 38 4
      packages/gtk/gtk/gtktext.pp
  38. 38 4
      packages/gtk/gtk/gtktipsquery.pp
  39. 44 4
      packages/gtk/gtk/gtktree.pp
  40. 38 4
      packages/gtk/gtk/gtktreeitem.pp
  41. 82 6
      packages/gtk/gtk/gtkwidget.pp
  42. 5 2
      packages/gtk/gtk/gtkwindow.pp

+ 1 - 1
packages/gtk/examples/Makefile

@@ -185,7 +185,7 @@ endif
 # Targets
 
 override DIROBJECTS+=$(wildcard tutorial)
-override EXEOBJECTS+=entry notebook scribble-simple clist ttt_test pixmap list progressbar filesel
+override EXEOBJECTS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel
 
 # Clean
 

+ 1 - 1
packages/gtk/examples/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [targets]
 dirs=tutorial
-programs=entry notebook scribble-simple clist ttt_test pixmap list progressbar filesel
+programs=entry notebook scribble clist ttt_test pixmap list progressbar filesel
 
 [require]
 packages=gtk

+ 154 - 0
packages/gtk/examples/scribble.pp

@@ -0,0 +1,154 @@
+{
+  $Id$
+
+  Converted from C to Pascal by Frank Loemker
+  <[email protected]>
+}
+program scribble;
+uses
+  glib,Gdk,Gtk;
+
+{ Backing pixmap for drawing area }
+const
+  pixmap : PGdkPixmap = NIL;
+
+{ Create a new backing pixmap of the appropriate size }
+function  configure_event (widget : PGtkWidget; event: PGdkEventConfigure):boolean; cdecl;
+begin
+  if pixmap<>NIL then
+    gdk_pixmap_unref(pixmap);
+
+  pixmap := gdk_pixmap_new(widget^.window,
+                           widget^.allocation.width,
+                           widget^.allocation.height,
+                           -1);
+  gdk_draw_rectangle (pixmap,
+                      PGtkStyle(widget^.thestyle)^.white_gc,
+                      gint(true),
+                      0, 0,
+                      widget^.allocation.width,
+                      widget^.allocation.height);
+
+  configure_event := TRUE;
+end;
+
+{ Redraw the screen from the backing pixmap }
+function  expose_event (widget : PGtkWidget ; event : PGdkEventExpose ) : boolean; cdecl;
+begin
+  gdk_draw_pixmap(widget^.window,
+                  PGtkStyle(widget^.thestyle)^.fg_gc[gtk_WIDGET_STATE (widget)],
+                  pixmap,
+                  event^.area.x, event^.area.y,
+                  event^.area.x, event^.area.y,
+                  event^.area.width, event^.area.height);
+  expose_event:= FALSE;
+end;
+
+{ Draw a rectangle on the screen }
+procedure draw_brush (widget : PGtkWidget ; x, y: gint16);
+var update_rect : TGdkRectangle;
+begin
+  update_rect.x := x - 5;
+  update_rect.y := y - 5;
+  update_rect.width := 10;
+  update_rect.height := 10;
+  gdk_draw_rectangle (pixmap,
+                      PGtkStyle(widget^.thestyle)^.black_gc,
+                      gint(true),
+                      update_rect.x, update_rect.y,
+                      update_rect.width, update_rect.height);
+  gtk_widget_draw (widget, @update_rect);
+end;
+
+function  button_press_event (widget : PGtkWidget ; event: PGdkEventButton ) : boolean; cdecl;
+begin
+  if (event^.button = 1) and (pixmap <> NIL) then begin
+    draw_brush (widget, trunc(event^.x), trunc(event^.y));
+  end;
+  button_press_event := TRUE;
+end;
+
+function  motion_notify_event (widget : PGtkWidget ; event: PGdkEventMotion ) : boolean; cdecl;
+var x, y : longint ;
+  state  : longint;
+begin
+  if (event^.is_hint<>0) then begin
+    gdk_window_get_pointer (event^.window, @x, @y, @state);
+  end else begin
+    x := trunc(event^.x);
+    y := trunc(event^.y);
+    state := event^.state;
+  end;
+
+  if ((state and gdk_BUTTON1_MASK)<>0) and (pixmap <> NIL) then
+    draw_brush (widget, x, y);
+
+  motion_notify_event := TRUE;
+end;
+
+procedure quit;
+begin
+  gtk_exit (0);
+end;
+
+var window, drawing_area, vbox, button : PGtkWidget;
+begin
+  gtk_init (@argc, @argv);
+  gtk_rc_init;
+
+  window := gtk_window_new (gtk_WINDOW_TOPLEVEL);
+  gtk_widget_set_name (window, 'Test Input');
+
+  vbox := gtk_vbox_new (false, 0);
+  gtk_container_add (PGtkCONTAINER (window), vbox);
+  gtk_widget_show (vbox);
+
+  gtk_signal_connect (PGtkOBJECT (window), 'destroy',
+                      gtk_SIGNAL_FUNC (@quit), NIL);
+
+  { Create the drawing area }
+
+  drawing_area := gtk_drawing_area_new ();
+  gtk_drawing_area_size (PGtkDRAWINGAREA (drawing_area), 200, 200);
+  gtk_box_pack_start (PGtkBOX (vbox), drawing_area, true, true, 0);
+
+  gtk_widget_show (drawing_area);
+
+  { Signals used to handle backing pixmap }
+
+  gtk_signal_connect (PGtkOBJECT (drawing_area), 'expose_event',
+                      gtk_SIGNAL_FUNC (@expose_event), NIL);
+  gtk_signal_connect (PGtkOBJECT(drawing_area),'configure_event',
+                      gtk_SIGNAL_FUNC (@configure_event), NIL);
+
+  { Event signals }
+
+  gtk_signal_connect (PGtkOBJECT (drawing_area), 'motion_notify_event',
+                      gtk_SIGNAL_FUNC (@motion_notify_event), NIL);
+  gtk_signal_connect (PGtkOBJECT (drawing_area), 'button_press_event',
+                      gtk_SIGNAL_FUNC (@button_press_event), NIL);
+
+  gtk_widget_set_events (drawing_area, gdk_EXPOSURE_MASK
+                         or gdk_LEAVE_NOTIFY_MASK
+                         or gdk_BUTTON_PRESS_MASK
+                         or gdk_POINTER_MOTION_MASK
+                         or gdk_POINTER_MOTION_HINT_MASK);
+
+  { .. And a quit button }
+  button := gtk_button_new_with_label ('Quit');
+  gtk_box_pack_start (PGtkBOX (vbox), button, false, false, 0);
+
+  gtk_signal_connect_object (PGtkOBJECT (button), 'clicked',
+                             gtk_SIGNAL_FUNC (@gtk_widget_destroy),
+                             PGtkOBJECT (window));
+  gtk_widget_show (button);
+  gtk_widget_show (window);
+
+  gtk_main ();
+end.
+{
+  $Log$
+  Revision 1.1.2.1  2000-09-09 18:42:51  peter
+    * gtk win32 fixes
+
+}

+ 6 - 3
packages/gtk/gdk/gdk.pp

@@ -39,13 +39,13 @@ uses
     gdkdll='gdk-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords C}
 {$else}
   const
     gdkdll='gdk';
   {$linklib c}
   {$linklib X11}
-  
+
   {$packrecords C}
 {$endif}
 
@@ -86,7 +86,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1.2.2  2000-09-06 21:13:34  peter
+  Revision 1.1.2.3  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1.2.2  2000/09/06 21:13:34  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.1.2.1  2000/08/06 10:33:10  peter

+ 40 - 4
packages/gtk/gdk/gdkprivate.pp

@@ -37,7 +37,7 @@
           resize_count : guint8;
           window_type : guint8;
           ref_count : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           extension_events : gint;
           filters : PGList;
           colormap : PGdkColormap;
@@ -315,7 +315,43 @@ function  GDK_font_lookup(xid : longint) : PGdkFont;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:19  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:02  michael
+  + Initial import
+
+  Revision 1.2  2000/02/20 14:02:45  sg
+  * Removed the following functions which don't exist anymore:
+      gdk_debug_level, gdk_show_events, gdk_stack_trace
+
+  Revision 1.1  1999/11/24 23:36:33  peter
+    * moved to packages dir
+
+  Revision 1.8  1999/10/21 14:35:23  peter
+    * removed glibdll constant
+
+  Revision 1.7  1999/10/06 17:42:47  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.6  1999/10/05 09:28:26  peter
+    * patches from Frank Loemker
+
+  Revision 1.5  1999/07/23 16:11:44  peter
+    * use packrecords C
+
+  Revision 1.4  1999/05/11 00:37:51  peter
+    * win32 fixes
+
+  Revision 1.3  1999/05/10 09:02:37  peter
+    * gtk 1.2 port working
+
+  Revision 1.2  1999/05/07 15:09:42  peter
+    * more fixes
+
+  Revision 1.1  1999/05/07 10:40:20  peter
+    * first things for 1.2
+
 }
+

+ 5 - 2
packages/gtk/glib/glib.pp

@@ -35,7 +35,7 @@ interface
     glibdll='glib-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords C}
 {$else}
   const
     glibdll='glib';
@@ -1650,7 +1650,10 @@ procedure set_year(var a : TGDate; __year : guint);
 end.
 {
   $Log$
-  Revision 1.1.2.2  2000-09-06 21:13:35  peter
+  Revision 1.1.2.3  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1.2.2  2000/09/06 21:13:35  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.1.2.1  2000/08/06 10:33:10  peter

+ 5 - 2
packages/gtk/glib/gmodule.pp

@@ -38,7 +38,7 @@ uses
     gmoduledll='gmodule-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords C}
 {$else}
   const
     gmoduledll='gmodule';
@@ -76,7 +76,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1.2.2  2000-09-06 21:13:35  peter
+  Revision 1.1.2.3  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1.2.2  2000/09/06 21:13:35  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.1.2.1  2000/08/06 10:33:10  peter

+ 5 - 2
packages/gtk/gtk/gtk.pp

@@ -39,7 +39,7 @@ uses
     gtkdll='gtk-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords c}
 {$else}
   const
     gtkdll='gtk';
@@ -79,7 +79,10 @@ Type
 end.
 {
   $Log$
-  Revision 1.1.2.2  2000-09-06 21:13:35  peter
+  Revision 1.1.2.3  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1.2.2  2000/09/06 21:13:35  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.1.2.1  2000/08/06 10:33:10  peter

+ 30 - 4
packages/gtk/gtk/gtkaccellabel.pp

@@ -29,7 +29,7 @@
           mod_name_alt : Pgchar;
           mod_separator : Pgchar;
           accel_seperator : Pgchar;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
 const
@@ -88,7 +88,33 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:20  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:02  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.6  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.5  1999/07/23 16:11:50  peter
+    * use packrecords C
+
+  Revision 1.4  1999/05/11 00:38:02  peter
+    * win32 fixes
+
+  Revision 1.3  1999/05/10 15:18:49  peter
+    * cdecl fixes
+
+  Revision 1.2  1999/05/10 09:02:53  peter
+    * gtk 1.2 port working
+
+  Revision 1.1  1999/05/07 10:40:23  peter
+    * first things for 1.2
+
 }
+

+ 45 - 4
packages/gtk/gtk/gtkbindings.pp

@@ -45,7 +45,7 @@ function  gtk_pattern_match_simple(pattern:Pgchar; thestring:Pgchar):gboolean;cd
           keyval : guint;
           modifiers : guint;
           binding_set : PGtkBindingSet;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           set_next : PGtkBindingEntry;
           hash_next : PGtkBindingEntry;
           signals : PGtkBindingSignal;
@@ -129,7 +129,48 @@ procedure set_in_emission(var a : TGtkBindingEntry; __in_emission : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.7  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.6  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.5  1999/07/23 16:11:59  peter
+    * use packrecords C
+
+  Revision 1.4  1999/05/11 00:38:11  peter
+    * win32 fixes
+
+  Revision 1.3  1999/05/10 15:18:58  peter
+    * cdecl fixes
+
+  Revision 1.2  1999/05/10 09:02:56  peter
+    * gtk 1.2 port working
+
+  Revision 1.1  1999/05/07 10:40:30  peter
+    * first things for 1.2
+
 }
+

+ 42 - 5
packages/gtk/gtk/gtkbox.pp

@@ -14,7 +14,7 @@
             container : TGtkContainer;
             children : PGList;
             spacing : gint16;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
 
     const
@@ -33,7 +33,7 @@ procedure set_homogeneous(var a : TGtkBox; __homogeneous : guint);
        TGtkBoxChild = record
             widget : PGtkWidget;
             padding : guint16;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
 
     const
@@ -134,7 +134,44 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.11  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.10  1999/07/23 16:12:00  peter
+    * use packrecords C
+
+  Revision 1.9  1999/05/11 00:38:12  peter
+    * win32 fixes
+
+  Revision 1.8  1999/05/10 15:18:59  peter
+    * cdecl fixes
+
+  Revision 1.7  1999/05/10 09:02:57  peter
+    * gtk 1.2 port working
+
+  Revision 1.6  1999/05/07 10:40:30  peter
+    * first things for 1.2
+
+  Revision 1.5  1998/11/09 10:09:36  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:16  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:22:11  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 59 - 4
packages/gtk/gtk/gtkbutton.pp

@@ -13,7 +13,7 @@
        TGtkButton = record
             bin : TGtkBin;
             child : PGtkWidget;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
 
     const
@@ -114,7 +114,62 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.13  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.12  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.11  1999/07/23 16:12:01  peter
+    * use packrecords C
+
+  Revision 1.10  1999/05/11 00:38:13  peter
+    * win32 fixes
+
+  Revision 1.9  1999/05/10 15:19:00  peter
+    * cdecl fixes
+
+  Revision 1.8  1999/05/10 09:02:59  peter
+    * gtk 1.2 port working
+
+  Revision 1.7  1999/05/07 17:40:13  peter
+    * more updates
+
+  Revision 1.6  1999/05/07 10:40:31  peter
+    * first things for 1.2
+
+  Revision 1.5  1998/11/09 10:09:37  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:17  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:22:12  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 66 - 5
packages/gtk/gtk/gtkclist.pp

@@ -136,7 +136,7 @@
             min_width : gint;
             max_width : gint;
             justification : TGtkJustification;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
 
        TGtkCListRow = record
@@ -147,7 +147,7 @@
             style : PGtkStyle;
             data : gpointer;
             destroy : TGtkDestroyNotify;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
        TGtkCellText = record
             thetype : TGtkCellType;
@@ -433,7 +433,68 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.15  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.14  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.13  1999/10/05 09:45:51  peter
+    * second try
+
+  Revision 1.12  1999/10/05 09:28:27  peter
+    * patches from Frank Loemker
+
+  Revision 1.11  1999/08/17 13:26:28  peter
+    * typo fix, test -> text
+
+  Revision 1.10  1999/07/23 16:12:05  peter
+    * use packrecords C
+
+  Revision 1.9  1999/05/11 00:38:17  peter
+    * win32 fixes
+
+  Revision 1.8  1999/05/10 15:19:04  peter
+    * cdecl fixes
+
+  Revision 1.7  1999/05/10 09:03:02  peter
+    * gtk 1.2 port working
+
+  Revision 1.6  1999/05/07 17:40:14  peter
+    * more updates
+
+  Revision 1.5  1998/11/09 10:09:40  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/22 11:37:41  peter
+    * fixes for win32
+
+  Revision 1.3  1998/10/21 20:22:15  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 50 - 4
packages/gtk/gtk/gtkcombo.pp

@@ -19,7 +19,7 @@
           list : PGtkWidget;
           entry_change_id : guint;
           list_change_id : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           current_button : guint16;
           activate_id : guint;
        end;
@@ -144,7 +144,53 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.9  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:08  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:38:19  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:07  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/07 17:40:17  peter
+    * more updates
+
+  Revision 1.4  1998/11/09 10:09:42  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:17  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 31 - 5
packages/gtk/gtk/gtkctree.pp

@@ -42,7 +42,7 @@
           tree_indent : gint;
           tree_spacing : gint;
           tree_column : gint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           drag_compare : TGtkCTreeCompareDragFunc;
        end;
 
@@ -60,7 +60,7 @@
           pixmap_opened : PGdkPixmap;
           mask_opened : PGdkBitmap;
           level : guint16;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
      TGtkCTreeClass = record
@@ -267,7 +267,33 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:03  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.6  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.5  1999/07/23 16:12:10  peter
+    * use packrecords C
+
+  Revision 1.4  1999/05/11 00:38:22  peter
+    * win32 fixes
+
+  Revision 1.3  1999/05/10 15:19:09  peter
+    * cdecl fixes
+
+  Revision 1.2  1999/05/10 09:03:05  peter
+    * gtk 1.2 port working
+
+  Revision 1.1  1999/05/07 17:40:18  peter
+    * more updates
+
 }
+

+ 50 - 4
packages/gtk/gtk/gtkeditable.pp

@@ -16,7 +16,7 @@
           current_pos : guint;
           selection_start_pos : guint;
           selection_end_pos : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           ic : PGdkIC;
           ic_attr : PGdkICAttr;
           clipboard_text : Pgchar;
@@ -140,7 +140,53 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:04  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.9  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:15  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:38:28  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:16  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:07  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:09:48  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:24  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 51 - 5
packages/gtk/gtk/gtkentry.pp

@@ -20,12 +20,12 @@
           text_length : guint16;
           text_max_length : guint16;
           scroll_offset : gint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           timer : guint32;
           button : guint;
           char_offset : Pgint;
           text_mb : Pgchar;
-          flag1 : word;
+          flag1 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -123,7 +123,53 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:04  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.9  1999/10/06 17:42:48  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:16  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:38:29  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:17  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:08  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:09:49  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:25  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 50 - 4
packages/gtk/gtk/gtkhandlebox.pp

@@ -15,7 +15,7 @@
           bin_window : PGdkWindow;
           float_window : PGdkWindow;
           shadow_type : TGtkShadowType;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           deskoff_x : gint;
           deskoff_y : gint;
           attach_allocation : TGtkAllocation;
@@ -156,7 +156,53 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:04  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:35  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.9  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:23  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:38:38  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:28  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:15  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:09:55  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:33  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 27 - 4
packages/gtk/gtk/gtkitemfactory.pp

@@ -53,7 +53,7 @@
           path : Pgchar;
           accelerator_key : guint;
           accelerator_mods : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           dummy : Pgchar;
           widgets : PGSList;
        end;
@@ -157,7 +157,30 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.5  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.4  1999/07/23 16:12:35  peter
+    * use packrecords C
+
+  Revision 1.3  1999/05/11 00:38:50  peter
+    * win32 fixes
+
+  Revision 1.2  1999/05/10 15:19:41  peter
+    * cdecl fixes
+
+  Revision 1.1  1999/05/10 09:13:59  peter
+    + new gtk 1.2 files
+
 }
+

+ 35 - 4
packages/gtk/gtk/gtklist.pp

@@ -23,7 +23,7 @@
           anchor : gint;
           drag_pos : gint;
           anchor_state : TGtkStateType;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -142,7 +142,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:39  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:38:53  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:45  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/07 17:40:28  peter
+    * more updates
+
+  Revision 1.4  1998/11/09 10:10:07  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:45  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 41 - 4
packages/gtk/gtk/gtkmenu.pp

@@ -23,7 +23,7 @@
           position_func_data : gpointer;
           toplevel : PGtkWidget;
           tearoff_window : PGtkWidget;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -101,7 +101,44 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.2  2000/06/23 20:23:13  peter
+    * removed gtkwin checks
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:12:41  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:38:57  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:19:49  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:03:23  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/09 10:10:10  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/22 11:37:42  peter
+    * fixes for win32
+
+  Revision 1.3  1998/10/21 20:22:48  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 60 - 5
packages/gtk/gtk/gtkmenuitem.pp

@@ -16,7 +16,7 @@
             accelerator_signal : guint;
             toggle_size : guint16;
             accelerator_width : guint16;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
             timer : guint;
          end;
 
@@ -47,7 +47,7 @@ procedure set_right_justify(var a : TGtkMenuItem; __right_justify : guint);
        TGtkMenuItemClass = record
           parent_class : TGtkItemClass;
           toggle_size : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           activate : procedure (menu_item:PGtkMenuItem);cdecl;
           activate_item : procedure (menu_item:PGtkMenuItem);cdecl;
         end;
@@ -146,7 +146,62 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.13  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.12  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.11  1999/10/05 09:28:27  peter
+    * patches from Frank Loemker
+
+  Revision 1.10  1999/07/23 16:12:44  peter
+    * use packrecords C
+
+  Revision 1.9  1999/05/11 00:39:00  peter
+    * win32 fixes
+
+  Revision 1.8  1999/05/10 15:19:52  peter
+    * cdecl fixes
+
+  Revision 1.7  1999/05/07 17:40:30  peter
+    * more updates
+
+  Revision 1.6  1998/11/24 12:59:02  peter
+    * fixed uses clause (from mailinglist)
+
+  Revision 1.5  1998/11/09 10:10:12  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/22 11:37:43  peter
+    * fixes for win32
+
+  Revision 1.3  1998/10/21 20:22:51  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 36 - 5
packages/gtk/gtk/gtkmenushell.pp

@@ -15,7 +15,7 @@
           children : PGList;
           active_menu_item : PGtkWidget;
           parent_menu_shell : PGtkWidget;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           activate_time : guint32;
        end;
 
@@ -53,7 +53,7 @@ procedure set_ignore_enter(var a : TGtkMenuShell; __ignore_enter : guint);
      PGtkMenuShellClass = ^TGtkMenuShellClass;
      TGtkMenuShellClass = record
           parent_class : TGtkContainerClass;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           deactivate : procedure (menu_shell:PGtkMenuShell); cdecl;
           selection_done : procedure (menu_shell:PGtkMenuShell);cdecl;
           move_current : procedure (menu_shell:PGtkMenuShell; direction:TGtkMenuDirectionType);cdecl;
@@ -190,7 +190,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:45  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:01  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:54  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:28  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:13  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:52  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 36 - 5
packages/gtk/gtk/gtknotebook.pp

@@ -24,7 +24,7 @@
           timer : guint32;
           tab_hborder : guint16;
           tab_vborder : guint16;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
      TGtkNotebookClass = record
@@ -36,7 +36,7 @@
           child : PGtkWidget;
           tab_label : PGtkWidget;
           menu_label : PGtkWidget;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           requisition : TGtkRequisition;
           allocation : TGtkAllocation;
           pad1 : gint16;
@@ -344,7 +344,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:47  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:04  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:19:56  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:31  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:16  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:54  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 36 - 10
packages/gtk/gtk/gtkpacker.pp

@@ -51,9 +51,9 @@ type
           anchor : TGtkAnchorType;
           side : TGtkSideType;
           options : TGtkPackerOptions;
-          flag0 : guint;
-          flag1 : guint;
-          flag2 : guint16;
+          flag0 : longint;
+          flag1 : longint;
+          flag2 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
      PGtkPacker = ^TGtkPacker;
@@ -61,10 +61,10 @@ type
           parent : TGtkContainer;
           children : PGList;
           spacing : guint;
-          flag0 : guint;
-          flag1 : guint;
-          flag2 : guint16;
-       end;
+          flag0 : longint;
+          flag1 : longint;
+          flag2 : {$ifdef win32}longint{$else}word{$endif};
+      end;
 
      PGtkPackerClass = ^TGtkPackerClass;
      TGtkPackerClass = record
@@ -114,7 +114,33 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.6  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.5  1999/07/23 16:12:50  peter
+    * use packrecords C
+
+  Revision 1.4  1999/06/29 23:46:55  peter
+    * changed enums to constants
+
+  Revision 1.3  1999/05/11 00:39:07  peter
+    * win32 fixes
+
+  Revision 1.2  1999/05/10 15:20:00  peter
+    * cdecl fixes
+
+  Revision 1.1  1999/05/10 09:14:00  peter
+    + new gtk 1.2 files
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtkpaned.pp

@@ -23,7 +23,7 @@
           last_allocation : gint;
           min_position : gint;
           max_position : gint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           handle_xpos : gint16;
           handle_ypos : gint16;
        end;
@@ -164,7 +164,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.2  2000/05/02 17:52:16  peter
+    * win32 fix
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:49  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:51  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:08  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:20:01  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:36  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:19  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:57  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 35 - 4
packages/gtk/gtk/gtkpixmap.pp

@@ -15,7 +15,7 @@
           pixmap : PGdkPixmap;
           mask : PGdkBitmap;
           pixmap_insensitive : PGdkPixmap;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
   const
      bm_TGtkPixmap_build_insensitive = $1;
@@ -77,7 +77,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:12:52  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:09  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:20:02  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:37  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:20  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:22:59  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtkpreview.pp

@@ -18,7 +18,7 @@
           bpp : guint16;
           rowstride : guint16;
           dither : TGdkRgbDither;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
   const
      bm_TGtkPreview_type = $1;
@@ -121,7 +121,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/10/05 09:28:27  peter
+    * patches from Frank Loemker
+
+  Revision 1.8  1999/07/23 16:12:54  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:11  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:20:06  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:39  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:21  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:23:00  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 27 - 4
packages/gtk/gtk/gtkprogress.pp

@@ -17,7 +17,7 @@
           format : Pgchar;
           x_align : gfloat;
           y_align : gfloat;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -106,7 +106,30 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:52  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.5  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.4  1999/07/23 16:12:55  peter
+    * use packrecords C
+
+  Revision 1.3  1999/05/11 00:39:12  peter
+    * win32 fixes
+
+  Revision 1.2  1999/05/10 15:20:09  peter
+    * cdecl fixes
+
+  Revision 1.1  1999/05/10 09:14:00  peter
+    + new gtk 1.2 files
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtkprogressbar.pp

@@ -26,7 +26,7 @@
           activity_pos : gint;
           activity_step : guint;
           activity_blocks : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -93,7 +93,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:12:57  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:13  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:10  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:03:40  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/24 12:59:03  peter
+    * fixed uses clause (from mailinglist)
+
+  Revision 1.4  1998/11/09 10:10:22  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:23:01  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 53 - 4
packages/gtk/gtk/gtkrange.pp

@@ -20,7 +20,7 @@
             y_click_point : gint16;
             button : guint8;
             digits : gint8;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
             timer : guint32;
             old_value : gfloat;
             old_lower : gfloat;
@@ -179,7 +179,56 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.11  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:13:00  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:16  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:14  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:03:44  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1999/05/07 17:40:32  peter
+    * more updates
+
+  Revision 1.4  1998/11/09 10:10:25  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:23:04  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 35 - 4
packages/gtk/gtk/gtkscrolledwindow.pp

@@ -14,7 +14,7 @@
           container : TGtkBin;
           hscrollbar : PGtkWidget;
           vscrollbar : PGtkWidget;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -138,7 +138,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:05  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:13:04  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:21  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:20:20  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:03:51  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:29  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:23:09  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 56 - 4
packages/gtk/gtk/gtksignal.pp

@@ -19,7 +19,7 @@
             object_type : TGtkType;
             signal_id : guint;
             signal_name : Pgchar;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
             signal_flags : TGtkSignalRunType;
             return_val : TGtkType;
             nparams : guint;
@@ -97,7 +97,59 @@ procedure set_is_user_signal(var a : TGtkSignalQuery; __is_user_signal : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:06  michael
+  + Initial import
+
+  Revision 1.2  2000/05/26 16:23:30  peter
+    * update for new win32 dll's
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.15  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.14  1999/07/23 16:13:07  peter
+    * use packrecords C
+
+  Revision 1.13  1999/06/10 20:00:20  peter
+    * fixed tictactoe
+
+  Revision 1.12  1999/05/11 00:39:24  peter
+    * win32 fixes
+
+  Revision 1.11  1999/05/10 19:18:32  peter
+    * more fixes for the examples to work
+
+  Revision 1.10  1999/05/10 15:20:23  peter
+    * cdecl fixes
+
+  Revision 1.9  1999/05/10 09:03:55  peter
+    * gtk 1.2 port working
+
+  Revision 1.8  1999/05/07 15:10:13  peter
+    * more fixes
+
+  Revision 1.7  1999/02/01 09:58:48  michael
+  + Patch from Frank Loemker
+
+  Revision 1.6  1999/01/28 19:40:38  peter
+    * gtk compiles again and now uses only one makefile
+
+  Revision 1.5  1999/01/26 12:42:24  michael
+  *** empty log message ***
+
+  Revision 1.4  1998/11/12 11:35:53  peter
+    + array of const
+
+  Revision 1.3  1998/10/21 20:23:12  peter
+    * cdecl, packrecord fixes(from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 27 - 4
packages/gtk/gtk/gtksocket.pp

@@ -17,7 +17,7 @@
           current_width : guint16;
           current_height : guint16;
           plug_window : PGdkWindow;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -108,7 +108,30 @@ procedure set_need_map(var a : TGtkSocket; __need_map : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:06  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.5  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.4  1999/07/23 16:13:08  peter
+    * use packrecords C
+
+  Revision 1.3  1999/05/11 00:39:26  peter
+    * win32 fixes
+
+  Revision 1.2  1999/05/10 15:20:24  peter
+    * cdecl fixes
+
+  Revision 1.1  1999/05/10 09:14:00  peter
+    + new gtk 1.2 files
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtkspinbutton.pp

@@ -29,7 +29,7 @@
           climb_rate : gfloat;
           timer_step : gfloat;
           update_policy : TGtkSpinButtonUpdatePolicy;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -217,7 +217,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:06  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:13:09  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:27  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:25  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:03:57  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/09 10:10:31  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/22 11:37:44  peter
+    * fixes for win32
+
+  Revision 1.3  1998/10/21 20:23:13  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 37 - 6
packages/gtk/gtk/gtktable.pp

@@ -22,7 +22,7 @@
           ncols : guint16;
           column_spacing : guint16;
           row_spacing : guint16;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
      TGtkTableClass = record
@@ -37,14 +37,14 @@
           bottom_attach : guint16;
           xpadding : guint16;
           ypadding : guint16;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
      TGtkTableRowCol = record
           requisition : guint16;
           allocation : guint16;
           spacing : guint16;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -265,7 +265,38 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:06  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.9  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.8  1999/07/23 16:13:12  peter
+    * use packrecords C
+
+  Revision 1.7  1999/05/11 00:39:30  peter
+    * win32 fixes
+
+  Revision 1.6  1999/05/10 15:20:28  peter
+    * cdecl fixes
+
+  Revision 1.5  1999/05/10 09:04:02  peter
+    * gtk 1.2 port working
+
+  Revision 1.4  1998/11/09 10:10:34  peter
+    + C type casts are now correctly handled
+
+  Revision 1.3  1998/10/21 20:23:16  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtktext.pp

@@ -41,7 +41,7 @@
           first_cut_pixels : guint;
           first_onscreen_hor_pixel : guint;
           first_onscreen_ver_pixel : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           freeze_count : guint;
           text_properties : PGList;
           text_properties_end : PGList;
@@ -189,7 +189,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:06  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:13:14  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:32  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:31  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:04:04  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/09 10:10:35  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:19  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:23:17  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtktipsquery.pp

@@ -12,7 +12,7 @@
      PGtkTipsQuery = ^TGtkTipsQuery;
      TGtkTipsQuery = record
           thelabel : TGtkLabel;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
           label_inactive : Pgchar;
           label_no_tip : Pgchar;
           caller : PGtkWidget;
@@ -99,7 +99,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:07  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:36  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:13:15  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:34  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:33  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:04:06  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/09 10:10:36  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:20  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:23:18  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 44 - 4
packages/gtk/gtk/gtktree.pp

@@ -25,7 +25,7 @@
           level : guint;
           indent_value : guint;
           current_indent : guint;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -140,7 +140,47 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:07  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:37  peter
+    * moved to packages dir
+
+  Revision 1.12  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.11  1999/07/23 16:13:19  peter
+    * use packrecords C
+
+  Revision 1.10  1999/06/29 23:46:58  peter
+    * changed enums to constants
+
+  Revision 1.9  1999/05/11 00:39:38  peter
+    * win32 fixes
+
+  Revision 1.8  1999/05/10 15:20:38  peter
+    * cdecl fixes
+
+  Revision 1.7  1999/05/10 09:04:10  peter
+    * gtk 1.2 port working
+
+  Revision 1.6  1998/11/09 10:10:40  peter
+    + C type casts are now correctly handled
+
+  Revision 1.5  1998/10/22 11:37:45  peter
+    * fixes for win32
+
+  Revision 1.4  1998/10/21 22:25:21  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:23:22  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 38 - 4
packages/gtk/gtk/gtktreeitem.pp

@@ -17,7 +17,7 @@
           plus_pix_widget : PGtkWidget;
           minus_pix_widget : PGtkWidget;
           pixmaps : PGList;
-          flag0 : word;
+          flag0 : {$ifdef win32}longint{$else}word{$endif};
        end;
 
   const
@@ -93,7 +93,41 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:07  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:37  peter
+    * moved to packages dir
+
+  Revision 1.10  1999/10/06 17:42:50  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.9  1999/07/23 16:13:20  peter
+    * use packrecords C
+
+  Revision 1.8  1999/05/11 00:39:39  peter
+    * win32 fixes
+
+  Revision 1.7  1999/05/10 15:20:39  peter
+    * cdecl fixes
+
+  Revision 1.6  1999/05/10 09:04:11  peter
+    * gtk 1.2 port working
+
+  Revision 1.5  1998/11/09 10:10:41  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:22  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:23:23  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 82 - 6
packages/gtk/gtk/gtkwidget.pp

@@ -29,6 +29,14 @@
        GTK_APP_PAINTABLE = 1 shl 19;
        GTK_RECEIVES_DEFAULT = 1 shl 20;
 
+    type
+       TGtkRcFlags = longint;
+    const
+       GTK_RC_FG = 1;
+       GTK_RC_BG = 2;
+       GTK_RC_TEXT = 4;
+       GTK_RC_BASE = 8;
+
     type
        PGtkRequisition = ^TGtkRequisition;
        TGtkRequisition = record
@@ -160,9 +168,6 @@
 
      PGtkThemeEngine = ^TGtkThemeEngine;
 
-     TGtkRcFlags = (GTK_RC_FG := 1 shl 0,GTK_RC_BG := 1 shl 1,GTK_RC_TEXT := 1 shl 2,
-       GTK_RC_BASE := 1 shl 3);
-
      PGtkRcStyle = ^TGtkRcStyle;
      TGtkRcStyle = record
           name : Pgchar;
@@ -178,6 +183,7 @@
           engine_data : gpointer;
        end;
 
+
 {*************************************
       Insertion from gtktheme
 *************************************}
@@ -546,7 +552,77 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:25  michael
-  + removed logs
- 
+  Revision 1.1.2.1  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1  2000/07/13 06:34:08  michael
+  + Initial import
+
+  Revision 1.1  1999/11/24 23:36:37  peter
+    * moved to packages dir
+
+  Revision 1.18  1999/10/21 08:42:01  florian
+    * some changes to get it work with gtk 1.3 under Windows 98:
+      - removed some trailing space after the import name
+      - In gtkbindings.h is
+        #define  gtk_binding_entry_add          gtk_binding_entry_clear
+        so in the pascal headers the import name of gtk_bindings_entry_add should be
+        gtk_binding_entry_clear!
+      - removed the declaration of
+        gtk_drag_source_unset in gtkdnd.pp it isn't in gtk-1.3.dll!
+      - in gdk.pp glibdll must be set to gdk-1.3:
+        const
+           gdkdll='gdk-1.3';
+           glibdll='gdk-1.3';
+        else the whole gdk_* calls are imported from glib-1.3.dll which is wrong!
+
+  Revision 1.17  1999/10/06 17:42:51  peter
+    * external is now only in the interface
+    * removed gtk 1.0 support
+
+  Revision 1.16  1999/10/05 09:28:27  peter
+    * patches from Frank Loemker
+
+  Revision 1.15  1999/07/23 16:13:29  peter
+    * use packrecords C
+
+  Revision 1.14  1999/06/29 23:47:01  peter
+    * changed enums to constants
+
+  Revision 1.13  1999/06/22 15:32:14  daniel
+  *** empty log message ***
+
+  Revision 1.12  1999/05/11 00:39:50  peter
+    * win32 fixes
+
+  Revision 1.11  1999/05/10 15:20:50  peter
+    * cdecl fixes
+
+  Revision 1.10  1999/05/10 09:04:14  peter
+    * gtk 1.2 port working
+
+  Revision 1.9  1999/05/07 15:10:26  peter
+    * more fixes
+
+  Revision 1.8  1999/05/07 10:40:37  peter
+    * first things for 1.2
+
+  Revision 1.7  1999/01/28 19:40:39  peter
+    * gtk compiles again and now uses only one makefile
+
+  Revision 1.6  1998/11/12 11:35:54  peter
+    + array of const
+
+  Revision 1.5  1998/11/09 10:10:51  peter
+    + C type casts are now correctly handled
+
+  Revision 1.4  1998/10/21 22:25:23  peter
+    * fixed some wrong cdecls
+
+  Revision 1.3  1998/10/21 20:23:33  peter
+    * cdecl, packrecord fixes (from the gtk.tar.gz)
+    * win32 support
+    * gtk.pp,gdk.pp for an all in one unit
+
 }
+

+ 5 - 2
packages/gtk/gtk/gtkwindow.pp

@@ -21,7 +21,7 @@
             default_widget : PGtkWidget;
             transient_parent : PGtkWindow;
             resize_count : gushort;
-            flag0 : word;
+            flag0 : {$ifdef win32}longint{$else}word{$endif};
          end;
 
     const
@@ -183,7 +183,10 @@ end;
 
 {
   $Log$
-  Revision 1.1.2.2  2000-09-06 21:13:35  peter
+  Revision 1.1.2.3  2000-09-09 18:42:53  peter
+    * gtk win32 fixes
+
+  Revision 1.1.2.2  2000/09/06 21:13:35  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.1.2.1  2000/09/06 20:46:25  peter