* fixes for gtk win32

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
 

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

packages/gtk/examples/scribble-simple.pp → packages/gtk/examples/scribble.pp

@@ -4,7 +4,7 @@
   Converted from C to Pascal by Frank Loemker
   <[email protected]>
 }
-program scribblesimple;
+program scribble;
 uses
   glib,Gdk,Gtk;
 
@@ -148,7 +148,7 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:18  michael
-  + removed logs
- 
+  Revision 1.1  2000-09-09 18:41:38  peter
+    * fixes for gtk win32
+
 }

packages/gtk/gdk/gdk.pp

@@ -39,7 +39,7 @@ uses
     gdkdll='gdk-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords C}
 {$else}
   const
     gdkdll='gdk';
@@ -86,7 +86,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.4  2000-09-06 21:14:28  peter
+  Revision 1.5  2000-09-09 18:41:38  peter
+    * fixes for gtk win32
+
+  Revision 1.4  2000/09/06 21:14:28  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.3  2000/08/06 10:46:23  peter

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,10 @@ function  GDK_font_lookup(xid : longint) : PGdkFont;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:19  michael
+  Revision 1.3  2000-09-09 18:41:38  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:19  michael
   + removed logs
  
 }

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.4  2000-09-06 21:14:28  peter
+  Revision 1.5  2000-09-09 18:41:38  peter
+    * fixes for gtk win32
+
+  Revision 1.4  2000/09/06 21:14:28  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.3  2000/08/06 10:46:23  peter

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.4  2000-09-06 21:14:28  peter
+  Revision 1.5  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.4  2000/09/06 21:14:28  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.3  2000/08/06 10:46:23  peter

packages/gtk/gtk/gtk.pp

@@ -39,7 +39,7 @@ uses
     gtkdll='gtk-1.3';
   {$define gtkwin}
 
-  {$packrecords 4}
+  {$packrecords c}
 {$else}
   const
     gtkdll='gtk';
@@ -78,7 +78,10 @@ Type
 end.
 {
   $Log$
-  Revision 1.4  2000-09-06 21:13:55  peter
+  Revision 1.5  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.4  2000/09/06 21:13:55  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.3  2000/08/06 10:46:23  peter

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:20  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:20  michael
   + removed logs
  
 }

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,10 @@ procedure set_in_emission(var a : TGtkBindingEntry; __in_emission : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:21  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:22  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:22  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:23  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:23  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ procedure set_is_user_signal(var a : TGtkSignalQuery; __is_user_signal : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ procedure set_need_map(var a : TGtkSocket; __need_map : guint);
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:24  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:24  michael
   + removed logs
  
 }

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,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:25  michael
+  Revision 1.3  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.2  2000/07/13 11:33:25  michael
   + removed logs
  
 }

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.4  2000-09-06 21:13:55  peter
+  Revision 1.5  2000-09-09 18:41:39  peter
+    * fixes for gtk win32
+
+  Revision 1.4  2000/09/06 21:13:55  peter
     * packrecords 4 for win32, packrecords c for linux
 
   Revision 1.3  2000/09/06 20:48:11  peter