Rough GTK3 port

1 files changed, 33 insertions, 7 deletions

diff --git a/libgtk_kylix/GTKClasses.pas b/libgtk_kylix/GTKClasses.pas
index 6071d74..aab76a2 100644
--- a/libgtk_kylix/GTKClasses.pas
+++ b/libgtk_kylix/GTKClasses.pas
@@ -1,6 +1,5 @@
 (*
     GTK-Kylix Library: GTKClasses - Non-visual objects
-    Version 0.6.4  (last updated 2003-04-03)
     Copyright (C) 2003 Tomas Bzatek <tbzatek@users.sourceforge.net>
 
     This library is free software; you can redistribute it and/or
@@ -24,13 +23,40 @@ unit GTKClasses;
 
 interface
 
-uses gtk2, lazglib2, Classes, SysUtils;
-
+uses lazglib2, lazgobject2, lazgtk3, Classes, SysUtils;
+
+const
+{ Basic Type Macros }
+   G_TYPE_FUNDAMENTAL_SHIFT = 2;
+   G_TYPE_FUNDAMENTAL_MAX = 255 shl G_TYPE_FUNDAMENTAL_SHIFT;
+
+{ Constant fundamental types,
+   introduced by g_type_init(). }
+   G_TYPE_INVALID = TGType(0 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_NONE = TGType(1 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_INTERFACE = TGType(2 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_CHAR = TGType(3 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_UCHAR = TGType(4 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_BOOLEAN = TGType(5 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_INT = TGType(6 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_UINT = TGType(7 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_LONG = TGType(8 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_ULONG = TGType(9 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_INT64 = TGType(10 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_UINT64 = TGType(11 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_ENUM = TGType(12 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_FLAGS = TGType(13 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_FLOAT = TGType(14 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_DOUBLE = TGType(15 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_STRING = TGType(16 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_POINTER = TGType(17 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_BOXED = TGType(18 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_PARAM = TGType(19 shl G_TYPE_FUNDAMENTAL_SHIFT);
+   G_TYPE_OBJECT = TGType(20 shl G_TYPE_FUNDAMENTAL_SHIFT);
 
 type
   TGDKColor = record
-                pixel: Cardinal;
-                red, green, blue: Word;
+                red, green, blue, alpha: gdouble;
               end;
 
 (****************************************** TGLIST ******************************************************************************)
@@ -154,12 +180,12 @@ end;
 procedure TGTKTimer.Start;
 begin
   if FHandlerID > 0 then Stop;
-  if FEnabled then FHandlerID := gtk_timeout_add(FInterval, @TGTKTimer_Timeout, Self);
+  if FEnabled then FHandlerID := g_timeout_add(FInterval, @TGTKTimer_Timeout, Self);
 end;
 
 procedure TGTKTimer.Stop;
 begin
-  if FHandlerID > 0 then gtk_timeout_remove(FHandlerID);
+  if FHandlerID > 0 then g_source_remove(FHandlerID);
   FHandlerID := 0;
 end;