X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_ecore.h;h=5f3565b0b34d6d20d9fe35f5432f52ff87f55622;hp=2c5d8165dca4cb6905fbb389f679c48ea9ee4c30;hb=0f8d24c745efc1057f8d25ada1375c88a1ab2ed7;hpb=4f5c88b4cfae4d5fb177710b09624f2e229d6a1b

diff --git a/src/ecore/rb_ecore.h b/src/ecore/rb_ecore.h
index 2c5d816..5f3565b 100644
--- a/src/ecore/rb_ecore.h
+++ b/src/ecore/rb_ecore.h
@@ -1,7 +1,5 @@
 /*
- * $Id: rb_ecore.h 45 2004-07-26 11:00:14Z tilman $
- *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,14 +22,7 @@
 #define GET_OBJ(obj, type, o) \
 	type *(o) = NULL; \
 \
-	Data_Get_Struct ((obj), type, (o)); \
-\
-	if (!*(o)) { \
-		rb_raise (rb_eException, \
-		          "%s destroyed already", \
-		          rb_obj_classname ((obj))); \
-		return Qnil; \
-	}
+	Data_Get_Struct ((obj), type, (o));
 
 #define CHECK_BOOL(val) \
 	if (TYPE ((val)) != T_TRUE && TYPE ((val)) != T_FALSE) { \
@@ -41,6 +32,15 @@
 		return Qnil; \
 	}
 
+#define CHECK_CLASS(val, klass) \
+	if (!rb_obj_is_kind_of ((val), (klass))) { \
+		rb_raise (rb_eTypeError, \
+		          "wrong argument type %s (expected %s)", \
+		          rb_obj_classname ((val)), \
+		          rb_class2name ((klass))); \
+		return Qnil; \
+	}
+
 #define INSPECT(obj, type) \
 	char buf[128]; \
 \
@@ -48,10 +48,14 @@
 \
 	snprintf (buf, sizeof (buf), \
 	          "#<%s:%p ptr=%p>", rb_obj_classname ((obj)), \
-	          (void *) obj, *o); \
+	          (void *) obj, o->real); \
 \
 	return rb_str_new2 (buf);
 
+#define DEF_CONST(mod, prefix, name) \
+	rb_define_const ((mod), #name, \
+	                 INT2FIX (prefix##name));
+
 #ifndef __RB_ECORE_C
 VALUE mEcore;
 #endif