X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_main.h;h=4ea2c76d5368a8b2b269d02fe9623d0888618c86;hb=HEAD;hp=762c3a61a2fc01a8a37ce0bc44253cb749fc6d6f;hpb=0ab509cfd10cd260793e7bd6d00ace66b8085962;p=ruby-evas.git

diff --git a/src/rb_evas_main.h b/src/rb_evas_main.h
index 762c3a6..4ea2c76 100644
--- a/src/rb_evas_main.h
+++ b/src/rb_evas_main.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_evas_main.h 32 2004-07-10 14:07:49Z tilman $
- *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -22,16 +20,9 @@
 #define __RB_EVAS_MAIN_H
 
 #define GET_OBJ(obj, type, o) \
-	type **(o) = NULL; \
-\
-	Data_Get_Struct ((obj), type *, (o)); \
+	type *(o) = NULL; \
 \
-	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) { \
@@ -46,7 +37,7 @@
 		rb_raise (rb_eTypeError, \
 		          "wrong argument type %s (expected %s)", \
 		          rb_obj_classname ((val)), \
-		          rb_obj_classname ((klass))); \
+		          rb_class2name ((klass))); \
 		return Qnil; \
 	}
 
@@ -57,10 +48,13 @@
 \
 	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));
+
 VALUE mEvas;
 
 #endif