Author: nigel
Date: 2005-05-24 19:55:50 -0400 (Tue, 24 May 2005)
New Revision: 44953
Added:
trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_idler.cs
Modified:
trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_animator.cs
trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_event.cs
trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_main.cs
trunk/efl-sharp/libs/efl-sharp/src/lib/ewl/ewl_object.cs
Log:
Ewl Fix
Modified: trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_animator.cs
===================================================================
--- trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_animator.cs
2005-05-24 23:45:17 UTC (rev 44952)
+++ trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_animator.cs
2005-05-24 23:55:50 UTC (rev 44953)
@@ -11,7 +11,7 @@
const string Library = "ecore";
[DllImport(Library)]
- private extern static IntPtr
ecore_animator_add(func_ecore_animator_add func, IntPtr data);
+ private extern static IntPtr
ecore_animator_add(AnimatorFunction func, IntPtr data);
[DllImport(Library)]
private extern static IntPtr ecore_animator_del(IntPtr
animator);
Modified: trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_event.cs
===================================================================
--- trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_event.cs 2005-05-24
23:45:17 UTC (rev 44952)
+++ trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_event.cs 2005-05-24
23:55:50 UTC (rev 44953)
@@ -11,14 +11,37 @@
{
const string Library = "ecore";
+ private static Hashtable callbacks = new Hashtable ();
+ private static Hashtable dataptrs = new Hashtable ();
+
+ /* PUBLIC METHODS */
+
+ public const int EventNone = 0;
+ public const int EventExeExit = 1;
+ public const int EventSignalUser = 2;
+ public const int EventSignalHup = 3;
+ public const int EventSignalExit = 4;
+ public const int EventSignalPower = 5;
+ public const int EventSignalRealtime = 6;
+ public const int EventCount = 7;
+
+ // FIXME: Are we using this for anything??? Kind of out of
place here
+ public static object GetObject(IntPtr p)
+ {
+ if(!dataptrs.Contains(p))
+ throw new Exception("Object pointer is
invalid");
+ // FIXME: Should we remove it?
+ return dataptrs[p];
+ }
+
[DllImport(Library)]
- private extern static IntPtr ecore_event_add(int type, IntPtr
ev, func_ecore_event_add func, IntPtr data);
+ private extern static IntPtr ecore_event_add(int type, IntPtr
ev, EventFunction func, IntPtr data);
[DllImport(Library)]
private extern static IntPtr ecore_event_del(IntPtr events);
[DllImport(Library)]
- private extern static IntPtr ecore_event_handler_add(int type,
func_ecore_event_handler_add func, IntPtr data);
- public static IntPtr HandlerAdd(int type,
func_ecore_event_handler_add func, object data)
+ private extern static IntPtr ecore_event_handler_add(int type,
EventHandlerFunction func, IntPtr data);
+ public static IntPtr HandlerAdd(int type, EventHandlerFunction
func, object data)
{
IntPtr p = new IntPtr(dataptrs.Count);
IntPtr key = ecore_event_handler_add(type, func, p);
Added: trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_idler.cs
===================================================================
--- trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_idler.cs 2005-05-24
23:45:17 UTC (rev 44952)
+++ trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_idler.cs 2005-05-24
23:55:50 UTC (rev 44953)
@@ -0,0 +1,30 @@
+namespace Ecore {
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+ class Idler
+ {
+ const string Library = "ecore";
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idler_add(IntPtr func,
IntPtr data);
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idler_del(IntPtr idler);
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idle_enterer_add(IntPtr
func, IntPtr data);
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idle_enterer_del(IntPtr
idle_enterer);
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idle_exiter_add(IntPtr func,
IntPtr data);
+
+ [DllImport(Library)]
+ private extern static IntPtr ecore_idle_exiter_del(IntPtr
idle_exiter);
+ }
+
+}
Modified: trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_main.cs
===================================================================
--- trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_main.cs 2005-05-24
23:45:17 UTC (rev 44952)
+++ trunk/efl-sharp/libs/efl-sharp/src/lib/ecore/ecore_main.cs 2005-05-24
23:55:50 UTC (rev 44953)
@@ -64,29 +64,6 @@
ecore_app_args_get(out argc, out argv);
}
- private static Hashtable callbacks = new Hashtable ();
- private static Hashtable dataptrs = new Hashtable ();
-
- /* PUBLIC METHODS */
-
- public const int EventNone = 0;
- public const int EventExeExit = 1;
- public const int EventSignalUser = 2;
- public const int EventSignalHup = 3;
- public const int EventSignalExit = 4;
- public const int EventSignalPower = 5;
- public const int EventSignalRealtime = 6;
- public const int EventCount = 7;
-
- // FIXME: Are we using this for anything??? Kind of out of
place here
- public static object GetObject(IntPtr p)
- {
- if(!dataptrs.Contains(p))
- throw new Exception("Object pointer is
invalid");
- // FIXME: Should we remove it?
- return dataptrs[p];
- }
-
}
}
Modified: trunk/efl-sharp/libs/efl-sharp/src/lib/ewl/ewl_object.cs
===================================================================
--- trunk/efl-sharp/libs/efl-sharp/src/lib/ewl/ewl_object.cs 2005-05-24
23:45:17 UTC (rev 44952)
+++ trunk/efl-sharp/libs/efl-sharp/src/lib/ewl/ewl_object.cs 2005-05-24
23:55:50 UTC (rev 44953)
@@ -100,9 +100,10 @@
[DllImport(Library)]
static extern void ewl_object_current_size_get(IntPtr obj, out
int w, out int h);
- public int Size(out int w, out int h) {
+ public void Size(out int w, out int h) {
- ewl_object_current_size_get(Raw, out w, out h);
+ ewl_object_current_size_get(Raw, out w, out h);
+
}
[DllImport(Library)]
@@ -115,7 +116,7 @@
[DllImport(Library)]
static extern void ewl_object_preferred_size_get(IntPtr obj,
out int w, out int h);
- public int PreferredSize(out int w, out int h) {
+ public void PreferredSize(out int w, out int h) {
ewl_object_preferred_size_get(Raw, out w, out h);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
