ruby-iup 0.0.2 → 0.1.0

data/ext/iup.c

@@ -1,36 +1,14 @@
-#include <ruby.h>
-#include <ctype.h>
 #include "rb_iup.h"
 
-#include "rb_iupcb.h"
-#include "rb_iupcells.h"
-#include "rb_iupcolorbar.h"
-#include "rb_iupcontrols.h"
-#include "rb_iupdial.h"
-#include "rb_iupgauge.h"
-#include "rb_iupgc.h"
-#include "rb_iupgetparam.h"
-#include "rb_iupgl.h"
-#include "rb_iupim.h"
-#include "rb_iupmask.h"
-#include "rb_iupmatrix.h"
-#include "rb_iupsbox.h"
-#include "rb_iupspin.h"
-#include "rb_iuptabs.h"
-#include "rb_iuptree.h"
-#include "rb_iupval.h"
-#include "rb_iup_pplot.h"
-#include "rb_cd.h"
-
-#ifdef WIN32
-#define DLLEXPORT __declspec(dllexport)
-#else
-#define DLLEXPORT
-#endif 
+#ifdef _MSC_VER
+int main(int argc, char **argv) {
+return 0;
+}
+#endif
 
 DLLEXPORT void Init_iup()
 {
-	VALUE VERSION = rb_str_new2("0.0.2");
+	VALUE VERSION = rb_str_new2("0.1.0");
 	rb_mIup = rb_define_module("Iup");	
 	rb_mCd = rb_define_module("Cd");
 	rb_define_const(rb_mIup, "RUBY_IUP_VERSION", VERSION);
@@ -232,7 +210,6 @@ DLLEXPORT void Init_iup()
 
 	rb_define_module_function(rb_mIup, "Cbox", rb_IupCboxv, -1);
 
-	rb_define_const(rb_mIup, "OUT", INT2FIX(IUP_OUT));
 	rb_define_module_function(rb_mIup, "Cells", rb_IupCells, -1);
 
 	rb_define_const(rb_mIup, "PRIMARY", INT2FIX(IUP_PRIMARY));
@@ -533,14 +510,6 @@ DLLEXPORT void Init_iup()
 	rb_define_const(rb_mIup, "K_m9", INT2FIX(K_m9));
 	rb_define_const(rb_mIup, "K_m0", INT2FIX(K_m0));
 
-	rb_define_const(rb_mIup, "IUPMASK_FLOAT", rb_str_new2(IUPMASK_FLOAT));
-	rb_define_const(rb_mIup, "IUPMASK_UFLOAT", rb_str_new2(IUPMASK_UFLOAT));
-	rb_define_const(rb_mIup, "IUPMASK_EFLOAT", rb_str_new2(IUPMASK_EFLOAT));
-	rb_define_const(rb_mIup, "IUPMASK_INT", rb_str_new2(IUPMASK_INT));
-	rb_define_const(rb_mIup, "IUPMASK_UINT", rb_str_new2(IUPMASK_UINT));
-	rb_define_method(rb_cIupNode, "maskSet", rb_iupmaskSet, 3);
-	rb_define_method(rb_cIupNode, "maskRemove", rb_iupmaskRemove, 0);
-
 	rb_define_module_function(rb_mIup, "Matrix", rb_IupMatrix, -1);
 	rb_define_method(rb_cIupMatrix, "MatSetAttribute", rb_IupMatSetAttribute, 4);
 	rb_define_method(rb_cIupMatrix, "MatStoreAttribute", rb_IupMatStoreAttribute, 4);

data/ext/{rb_cd.h → rb_cd.c}

@@ -1,13 +1,11 @@
 #include <ruby.h>
-#include "cd.h"
-#include "cdiup.h"
-#include "cdpdf.h"
+#include "rb_iup.h"
 
 extern VALUE rb_cCdCanvas;
 
 VALUE rb_cCdCanvas_initialize(VALUE self,VALUE v_canvas)
 {	
-	if(NUM2UINT(v_canvas)==0) return Qnil;
+	if(NUM2ULONG(v_canvas)==0) return Qnil;
 	rb_iv_set(self,"@canvas",v_canvas);
 	return self;
 }
@@ -31,15 +29,15 @@ VALUE rb_cdActiveCanvas(VALUE self)
 	cdCanvas* v;
 	v = cdActiveCanvas();
 	if(v==NULL) return Qnil;
-	return rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)v));
+	return rb_funcall(rb_cCdCanvas,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 }
 
 VALUE rb_cdActivate(VALUE self)
 {
 	int v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdActivate((cdCanvas*)NUM2UINT(v_canvas));
-	return UINT2NUM((unsigned)v); 
+	v = cdActivate((cdCanvas*)NUM2ULONG(v_canvas));
+	return ULONG2NUM((unsigned long)v); 
 }
 
 VALUE rb_cdCreateCanvas(VALUE self,VALUE v_context,VALUE v_data)
@@ -47,23 +45,23 @@ VALUE rb_cdCreateCanvas(VALUE self,VALUE v_context,VALUE v_data)
 	cdCanvas* v;
 	void* data;
 	if(TYPE(v_data)==T_FIXNUM || TYPE(v_data)==T_BIGNUM)
-		data = (void*)NUM2UINT(v_data);
+		data = (void*)NUM2ULONG(v_data);
 	else if(TYPE(v_data)==T_STRING)
-		data = (void*)RSTRING(v_data)->ptr;
+		data = (void*)RSTRING_PTR(v_data);
 	else {
 		VALUE v_ih = rb_iv_get(v_data,"@ihandle");
-		data = (void*)NUM2UINT(v_ih);
+		data = (void*)NUM2ULONG(v_ih);
 	}
-	v = cdCreateCanvas((cdContext*)NUM2UINT(v_context),data);
+	v = cdCreateCanvas((cdContext*)NUM2ULONG(v_context),data);
 	if(v) 
-		return rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)v));	
+		return rb_funcall(rb_cCdCanvas,rb_intern("new"),1,ULONG2NUM((unsigned long)v));	
 	return Qnil;
 }
 
 VALUE rb_cdKillCanvas(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdKillCanvas((cdCanvas*)NUM2UINT(v_canvas));
+	cdKillCanvas((cdCanvas*)NUM2ULONG(v_canvas));
 	return Qnil;
 }
 
@@ -71,8 +69,8 @@ VALUE rb_cdCanvasGetContext(VALUE self)
 {
 	cdContext* v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdCanvasGetContext((cdCanvas*)NUM2UINT(v_canvas));
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasGetContext((cdCanvas*)NUM2ULONG(v_canvas));
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasActivate(VALUE self)
@@ -80,62 +78,62 @@ VALUE rb_cdCanvasActivate(VALUE self)
 	cdCanvas* canvas = NULL;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int v;
-	if(v_canvas!=Qnil) canvas = (cdCanvas*)NUM2UINT(v_canvas);
+	if(v_canvas!=Qnil) canvas = (cdCanvas*)NUM2ULONG(v_canvas);
 	v = cdActivate(canvas);
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasDeactivate(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasDeactivate((cdCanvas*)NUM2UINT(v_canvas));
+	cdCanvasDeactivate((cdCanvas*)NUM2ULONG(v_canvas));
 	return Qnil;
 }
 
 VALUE rb_cdUseContextPlus(VALUE self,VALUE v_use)
 {
-	int use = NUM2UINT(v_use);
-	int v;
+	int use = NUM2ULONG(v_use);
+	unsigned long v;
 	v = cdUseContextPlus(use);
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdContextRegisterCallback(VALUE self,VALUE v_context,VALUE v_cb,VALUE v_func)
 {
-	int cb = NUM2UINT(v_cb);
+	unsigned long cb = NUM2ULONG(v_cb);
 	int v;
-	void *func = (void*)NUM2UINT(v_func);
-	v = cdContextRegisterCallback((cdContext*)NUM2UINT(v_context),cb,func);
-	return UINT2NUM((unsigned)v);
+	void *func = (void*)NUM2ULONG(v_func);
+	v = cdContextRegisterCallback((cdContext*)NUM2ULONG(v_context),cb,func);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdContextCaps(VALUE self,VALUE v_context)
 {
 	long v;
-	v = cdContextCaps((cdContext*)NUM2UINT(v_context));
+	v = cdContextCaps((cdContext*)NUM2ULONG(v_context));
 	return LONG2NUM(v);
 }
 
 VALUE rb_cdCanvasSimulate(VALUE self,VALUE v_mode)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	int mode = NUM2UINT(v_mode);
+	unsigned long mode = NUM2ULONG(v_mode);
 	int v;
-	v = cdCanvasSimulate((cdCanvas*)NUM2UINT(v_canvas),mode);
+	v = cdCanvasSimulate((cdCanvas*)NUM2ULONG(v_canvas),mode);
 	return INT2NUM(v);
 }
 
 VALUE rb_cdCanvasFlush(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasFlush((cdCanvas*)NUM2UINT(v_canvas));
+	cdCanvasFlush((cdCanvas*)NUM2ULONG(v_canvas));
 	return Qnil;
 }
 
 VALUE rb_cdCanvasClear(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasClear((cdCanvas*)NUM2UINT(v_canvas));
+	cdCanvasClear((cdCanvas*)NUM2ULONG(v_canvas));
 	return Qnil;
 }
 
@@ -143,40 +141,40 @@ VALUE rb_cdCanvasSaveState(VALUE self)
 {
 	cdState* v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdCanvasSaveState((cdCanvas*)NUM2UINT(v_canvas));
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasSaveState((cdCanvas*)NUM2ULONG(v_canvas));
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasRestoreState(VALUE self,VALUE v_state)
 {
-	cdState* state = (cdState*)NUM2UINT(v_state);
+	cdState* state = (cdState*)NUM2ULONG(v_state);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasRestoreState((cdCanvas*)NUM2UINT(v_canvas),state);
+	cdCanvasRestoreState((cdCanvas*)NUM2ULONG(v_canvas),state);
 	return Qnil;
 }
 
 VALUE rb_cdReleaseState(VALUE self,VALUE v_state)
 {
-	cdState* state = (cdState*)NUM2UINT(v_state);
+	cdState* state = (cdState*)NUM2ULONG(v_state);
 	cdReleaseState(state);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasSetAttribute(VALUE self,VALUE v_name,VALUE v_data)
 {
-	const char* name = RSTRING(v_name)->ptr;
-	char* data = RSTRING(v_data)->ptr;
+	const char* name = RSTRING_PTR(v_name);
+	char* data = RSTRING_PTR(v_data);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasSetAttribute((cdCanvas*)NUM2UINT(v_canvas),name,data);
+	cdCanvasSetAttribute((cdCanvas*)NUM2ULONG(v_canvas),name,data);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasGetAttribute(VALUE self,VALUE v_name)
 {
-	const char* name = RSTRING(v_name)->ptr;
+	const char* name = RSTRING_PTR(v_name);
 	char* v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdCanvasGetAttribute((cdCanvas*)NUM2UINT(v_canvas),name);
+	v = cdCanvasGetAttribute((cdCanvas*)NUM2ULONG(v_canvas),name);
 	return  rb_str_new2(v);
 }
 
@@ -186,10 +184,10 @@ VALUE rb_cdCanvasPlay(VALUE self,VALUE v_context,VALUE v_xmin,VALUE v_xmax,VALUE
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	void *data = (void*)NUM2UINT(v_data);
+	void *data = (void*)NUM2ULONG(v_data);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int v;
-	v = cdCanvasPlay((cdCanvas*)NUM2UINT(v_canvas),(cdContext*)NUM2UINT(v_context),xmin,xmax,ymin,ymax,data);
+	v = cdCanvasPlay((cdCanvas*)NUM2ULONG(v_canvas),(cdContext*)NUM2ULONG(v_context),xmin,xmax,ymin,ymax,data);
 	return INT2NUM(v);
 }
 
@@ -201,7 +199,7 @@ VALUE rb_cdCanvasGetSize(VALUE self,VALUE v_width,VALUE v_height,VALUE v_width_m
 	double mm_height;
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasGetSize((cdCanvas*)NUM2UINT(v_canvas),&width,&height,&mm_width,&mm_height);
+	cdCanvasGetSize((cdCanvas*)NUM2ULONG(v_canvas),&width,&height,&mm_width,&mm_height);
 	v_r = rb_ary_new3(4,INT2FIX(width),INT2FIX(height),rb_float_new(mm_width),rb_float_new(mm_height));
 	return v_r;
 }
@@ -211,16 +209,16 @@ VALUE rb_cdCanvasUpdateYAxis(VALUE self,VALUE v_y)
 	int y = NUM2INT(v_y);
 	int v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdCanvasUpdateYAxis((cdCanvas*)NUM2UINT(v_canvas),&y);
+	v = cdCanvasUpdateYAxis((cdCanvas*)NUM2ULONG(v_canvas),&y);
 	return INT2NUM(y);
 }
 
 VALUE rb_cdfCanvasUpdateYAxis(VALUE self,VALUE v_y)
 {
-	double y = RFLOAT(v_y)->value;
+	double y = RFLOAT_VALUE(v_y);
 	double v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdfCanvasUpdateYAxis((cdCanvas*)NUM2UINT(v_canvas),&y);
+	v = cdfCanvasUpdateYAxis((cdCanvas*)NUM2ULONG(v_canvas),&y);
 	return rb_float_new(y);
 }
 
@@ -229,28 +227,28 @@ VALUE rb_cdCanvasInvertYAxis(VALUE self,VALUE v_y)
 	int y = NUM2INT(v_y);
 	int v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdCanvasInvertYAxis((cdCanvas*)NUM2UINT(v_canvas),y);
+	v = cdCanvasInvertYAxis((cdCanvas*)NUM2ULONG(v_canvas),y);
 	return INT2NUM(y);
 }
 
 VALUE rb_cdfCanvasInvertYAxis(VALUE self,VALUE v_y)
 {
-	double y = RFLOAT(v_y)->value;
+	double y = RFLOAT_VALUE(v_y);
 	double v;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	v = cdfCanvasInvertYAxis((cdCanvas*)NUM2UINT(v_canvas),y);
+	v = cdfCanvasInvertYAxis((cdCanvas*)NUM2ULONG(v_canvas),y);
 	return rb_float_new(v);
 }
 
 VALUE rb_cdCanvasMM2Pixel(VALUE self,VALUE v_mm_dx,VALUE v_mm_dy)
 {
-	double mm_dx = RFLOAT(v_mm_dx)->value;
-	double mm_dy = RFLOAT(v_mm_dy)->value;
+	double mm_dx = RFLOAT_VALUE(v_mm_dx);
+	double mm_dy = RFLOAT_VALUE(v_mm_dy);
 	int dx;
 	int dy;
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasMM2Pixel((cdCanvas*)NUM2UINT(v_canvas),mm_dx,mm_dy,&dx,&dy);
+	cdCanvasMM2Pixel((cdCanvas*)NUM2ULONG(v_canvas),mm_dx,mm_dy,&dx,&dy);
 	v_r = rb_ary_new3(2,INT2FIX(dx),INT2FIX(dy));
 	return v_r;
 }
@@ -263,20 +261,20 @@ VALUE rb_cdCanvasPixel2MM(VALUE self,VALUE v_dx,VALUE v_dy)
 	int dy = NUM2INT(v_dy);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	VALUE v_r;
-	cdCanvasPixel2MM((cdCanvas*)NUM2UINT(v_canvas),dx,dy,&mm_dx,&mm_dy);
+	cdCanvasPixel2MM((cdCanvas*)NUM2ULONG(v_canvas),dx,dy,&mm_dx,&mm_dy);
 	v_r = rb_ary_new3(2,rb_float_new(mm_dx),rb_float_new(mm_dy));
 	return v_r;
 }
 
 VALUE rb_cdfCanvasMM2Pixel(VALUE self,VALUE v_mm_dx,VALUE v_mm_dy,VALUE v_dx,VALUE v_dy)
 {
-	double mm_dx = RFLOAT(v_mm_dx)->value;
-	double mm_dy = RFLOAT(v_mm_dy)->value;
+	double mm_dx = RFLOAT_VALUE(v_mm_dx);
+	double mm_dy = RFLOAT_VALUE(v_mm_dy);
 	double dx;
 	double dy;
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdfCanvasMM2Pixel((cdCanvas*)NUM2UINT(v_canvas),mm_dx,mm_dy,&dx,&dy);
+	cdfCanvasMM2Pixel((cdCanvas*)NUM2ULONG(v_canvas),mm_dx,mm_dy,&dx,&dy);
 	v_r = rb_ary_new3(2,rb_float_new(dx),rb_float_new(dy));
 	return v_r;
 }
@@ -285,11 +283,11 @@ VALUE rb_cdfCanvasPixel2MM(VALUE self,VALUE v_dx,VALUE v_dy)
 {
 	double mm_dx;
 	double mm_dy;
-	double dx = RFLOAT(v_dx)->value;
-	double dy = RFLOAT(v_dy)->value;
+	double dx = RFLOAT_VALUE(v_dx);
+	double dy = RFLOAT_VALUE(v_dy);
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdfCanvasPixel2MM((cdCanvas*)NUM2UINT(v_canvas),dx,dy,&mm_dx,&mm_dy);
+	cdfCanvasPixel2MM((cdCanvas*)NUM2ULONG(v_canvas),dx,dy,&mm_dx,&mm_dy);
 	v_r = rb_ary_new3(2,rb_float_new(mm_dx),rb_float_new(mm_dy));
 	return v_r;
 }
@@ -299,16 +297,16 @@ VALUE rb_cdCanvasOrigin(VALUE self,VALUE v_x,VALUE v_y)
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasOrigin((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	cdCanvasOrigin((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasOrigin(VALUE self,VALUE v_x,VALUE v_y)
 {
-	double x = RFLOAT(v_x)->value;
-	double y = RFLOAT(v_y)->value;
+	double x = RFLOAT_VALUE(v_x);
+	double y = RFLOAT_VALUE(v_y);
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdfCanvasOrigin((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	cdfCanvasOrigin((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
@@ -318,7 +316,7 @@ VALUE rb_cdCanvasGetOrigin(VALUE self)
 	int y;
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasGetOrigin((cdCanvas*)NUM2UINT(v_canvas),&x,&y);
+	cdCanvasGetOrigin((cdCanvas*)NUM2ULONG(v_canvas),&x,&y);
 	v_r = rb_ary_new3(2,INT2FIX(x),INT2FIX(y));
 	return v_r;
 }
@@ -329,7 +327,7 @@ VALUE rb_cdfCanvasGetOrigin(VALUE self,VALUE v_x,VALUE v_y)
 	double y;
 	VALUE v_r;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdfCanvasGetOrigin((cdCanvas*)NUM2UINT(v_canvas),&x,&y);
+	cdfCanvasGetOrigin((cdCanvas*)NUM2ULONG(v_canvas),&x,&y);
 	v_r = rb_ary_new3(2,rb_float_new(x),rb_float_new(y));
 	return v_r;
 }
@@ -341,10 +339,10 @@ VALUE rb_cdCanvasTransform(VALUE self,VALUE v_matrix)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	if(v_matrix!=Qnil) {
 		matrix = xmalloc(sizeof(double)*6);
-		for(i=0;i<RARRAY(v_matrix)->len && i<6;i++)
-		  	matrix[i] = RFLOAT(RARRAY(v_matrix)->ptr[i])->value;
+		for(i=0;i<RARRAY_LEN(v_matrix) && i<6;i++)
+		  	matrix[i] = RFLOAT_VALUE(RARRAY_PTR(v_matrix)[i]);
 	}
-	cdCanvasTransform((cdCanvas*)NUM2UINT(v_canvas),matrix);
+	cdCanvasTransform((cdCanvas*)NUM2ULONG(v_canvas),matrix);
 	if(matrix) free(matrix);
 	return Qnil;
 }
@@ -355,7 +353,7 @@ VALUE rb_cdCanvasGetTransform(VALUE self)
 	int i;
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	VALUE v_r = rb_ary_new();
-	v = cdCanvasGetTransform((cdCanvas*)NUM2UINT(v_canvas));
+	v = cdCanvasGetTransform((cdCanvas*)NUM2ULONG(v_canvas));
 	if(v==NULL) return Qnil;
 	for(i=0;i<6;i++)
 		rb_ary_push(v_r,rb_float_new(v[i]));
@@ -369,36 +367,36 @@ VALUE rb_cdCanvasTransformMultiply(VALUE self,VALUE v_matrix)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	if(v_matrix!=Qnil) {
 		matrix = xmalloc(sizeof(double)*6);
-		for(i=0;i<RARRAY(v_matrix)->len && i<6;i++)
-		  	matrix[i] = RFLOAT(RARRAY(v_matrix)->ptr[i])->value;
+		for(i=0;i<RARRAY_LEN(v_matrix) && i<6;i++)
+		  	matrix[i] = RFLOAT_VALUE(RARRAY_PTR(v_matrix)[i]);
 	}
-	cdCanvasTransformMultiply((cdCanvas*)NUM2UINT(v_canvas),matrix);
+	cdCanvasTransformMultiply((cdCanvas*)NUM2ULONG(v_canvas),matrix);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasTransformRotate(VALUE self,VALUE v_angle)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double angle = RFLOAT(v_angle)->value;
-	cdCanvasTransformRotate((cdCanvas*)NUM2UINT(v_canvas),angle);
+	double angle = RFLOAT_VALUE(v_angle);
+	cdCanvasTransformRotate((cdCanvas*)NUM2ULONG(v_canvas),angle);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasTransformScale(VALUE self,VALUE v_sx,VALUE v_sy)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double sx = RFLOAT(v_sx)->value;
-	double sy = RFLOAT(v_sy)->value;
-	cdCanvasTransformScale((cdCanvas*)NUM2UINT(v_canvas),sx,sy);
+	double sx = RFLOAT_VALUE(v_sx);
+	double sy = RFLOAT_VALUE(v_sy);
+	cdCanvasTransformScale((cdCanvas*)NUM2ULONG(v_canvas),sx,sy);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasTransformTranslate(VALUE self,VALUE v_dx,VALUE v_dy)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double dx = RFLOAT(v_dx)->value;
-	double dy = RFLOAT(v_dy)->value;
-	cdCanvasTransformTranslate((cdCanvas*)NUM2UINT(v_canvas),dx,dy);
+	double dx = RFLOAT_VALUE(v_dx);
+	double dy = RFLOAT_VALUE(v_dy);
+	cdCanvasTransformTranslate((cdCanvas*)NUM2ULONG(v_canvas),dx,dy);
 	return Qnil;
 }
 
@@ -410,7 +408,7 @@ VALUE rb_cdCanvasTransformPoint(VALUE self,VALUE v_x,VALUE v_y)
 	int tx;
 	int ty;
 	VALUE v_r;
-	cdCanvasTransformPoint((cdCanvas*)NUM2UINT(v_canvas),x,y,&tx,&ty);
+	cdCanvasTransformPoint((cdCanvas*)NUM2ULONG(v_canvas),x,y,&tx,&ty);
 	v_r = rb_ary_new3(2,INT2FIX(tx),INT2FIX(ty));
 	return v_r;
 }
@@ -418,12 +416,12 @@ VALUE rb_cdCanvasTransformPoint(VALUE self,VALUE v_x,VALUE v_y)
 VALUE rb_cdfCanvasTransformPoint(VALUE self,VALUE v_x,VALUE v_y)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double x = RFLOAT(v_x)->value;
-	double y = RFLOAT(v_y)->value;
+	double x = RFLOAT_VALUE(v_x);
+	double y = RFLOAT_VALUE(v_y);
 	double tx;
 	double ty;
 	VALUE v_r;
-	cdfCanvasTransformPoint((cdCanvas*)NUM2UINT(v_canvas),x,y,&tx,&ty);
+	cdfCanvasTransformPoint((cdCanvas*)NUM2ULONG(v_canvas),x,y,&tx,&ty);
 	v_r = rb_ary_new3(2,rb_float_new(tx),rb_float_new(ty));
 	return v_r;
 }
@@ -433,8 +431,8 @@ VALUE rb_cdCanvasClip(VALUE self,VALUE v_mode)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int mode = NUM2INT(v_mode);
 	int v;
-	v = cdCanvasClip((cdCanvas*)NUM2UINT(v_canvas),mode);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasClip((cdCanvas*)NUM2ULONG(v_canvas),mode);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasClipArea(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_ymax)
@@ -444,7 +442,7 @@ VALUE rb_cdCanvasClipArea(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALU
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdCanvasClipArea((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);
+	cdCanvasClipArea((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -457,7 +455,7 @@ VALUE rb_cdCanvasGetClipArea(VALUE self)
 	int ymax;
 	int v;
 	VALUE v_r;
-	v = cdCanvasGetClipArea((cdCanvas*)NUM2UINT(v_canvas),&xmin,&xmax,&ymin,&ymax);
+	v = cdCanvasGetClipArea((cdCanvas*)NUM2ULONG(v_canvas),&xmin,&xmax,&ymin,&ymax);
 	v_r = rb_ary_new3(4,INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax));
 	return v_r;
 }
@@ -465,11 +463,11 @@ VALUE rb_cdCanvasGetClipArea(VALUE self)
 VALUE rb_cdfCanvasClipArea(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_ymax)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xmin = RFLOAT(v_xmin)->value;
-	double xmax = RFLOAT(v_xmax)->value;
-	double ymin = RFLOAT(v_ymin)->value;
-	double ymax = RFLOAT(v_ymax)->value;
-	cdfCanvasClipArea((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);	
+	double xmin = RFLOAT_VALUE(v_xmin);
+	double xmax = RFLOAT_VALUE(v_xmax);
+	double ymin = RFLOAT_VALUE(v_ymin);
+	double ymax = RFLOAT_VALUE(v_ymax);
+	cdfCanvasClipArea((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);	
 	return Qnil;
 }
 
@@ -482,7 +480,7 @@ VALUE rb_cdfCanvasGetClipArea(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,
 	double ymax;
 	int v;
 	VALUE v_r;
-	v = cdfCanvasGetClipArea((cdCanvas*)NUM2UINT(v_canvas),&xmin,&xmax,&ymin,&ymax);
+	v = cdfCanvasGetClipArea((cdCanvas*)NUM2ULONG(v_canvas),&xmin,&xmax,&ymin,&ymax);
 	v_r = rb_ary_new3(4,rb_float_new(xmin),rb_float_new(xmax),rb_float_new(ymin),rb_float_new(ymax));
 	return v_r;
 }
@@ -493,16 +491,16 @@ VALUE rb_cdCanvasIsPointInRegion(VALUE self,VALUE v_x,VALUE v_y)
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
 	int v;
-	v = cdCanvasIsPointInRegion((cdCanvas*)NUM2UINT(v_canvas),x,y);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasIsPointInRegion((cdCanvas*)NUM2ULONG(v_canvas),x,y);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasOffsetRegion(VALUE self,VALUE v_x,VALUE v_y)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	int x = NUM2UINT(v_x);
-	int y = NUM2UINT(v_y);
-	cdCanvasOffsetRegion((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	int x = NUM2ULONG(v_x);
+	int y = NUM2ULONG(v_y);
+	cdCanvasOffsetRegion((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
@@ -514,7 +512,7 @@ VALUE rb_cdCanvasGetRegionBox(VALUE self)
 	int ymin;
 	int ymax;
 	VALUE v_r;
-	cdCanvasGetRegionBox((cdCanvas*)NUM2UINT(v_canvas),&xmin,&xmax,&ymin,&ymax);
+	cdCanvasGetRegionBox((cdCanvas*)NUM2ULONG(v_canvas),&xmin,&xmax,&ymin,&ymax);
 	v_r = rb_ary_new3(4,INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax));
 	return v_r;
 }
@@ -524,8 +522,8 @@ VALUE rb_cdCanvasRegionCombineMode(VALUE self,VALUE v_mode)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int mode = NUM2INT(v_mode);
 	int v;
-	v = cdCanvasRegionCombineMode((cdCanvas*)NUM2UINT(v_canvas),mode);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasRegionCombineMode((cdCanvas*)NUM2ULONG(v_canvas),mode);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasPixel(VALUE self,VALUE v_x,VALUE v_y,VALUE v_color)
@@ -534,7 +532,7 @@ VALUE rb_cdCanvasPixel(VALUE self,VALUE v_x,VALUE v_y,VALUE v_color)
 	long int color = NUM2LONG(v_color);
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	cdCanvasPixel((cdCanvas*)NUM2UINT(v_canvas),x,y,color);
+	cdCanvasPixel((cdCanvas*)NUM2ULONG(v_canvas),x,y,color);
 	return Qnil;
 }
 
@@ -543,7 +541,7 @@ VALUE rb_cdCanvasMark(VALUE self,VALUE v_x,VALUE v_y)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	cdCanvasMark((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	cdCanvasMark((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
@@ -554,7 +552,7 @@ VALUE rb_cdCanvasLine(VALUE self,VALUE v_x1,VALUE v_y1,VALUE v_x2,VALUE v_y2)
 	int y1 = NUM2INT(v_y1);
 	int x2 = NUM2INT(v_x2);
 	int y2 = NUM2INT(v_y2);
-	cdCanvasLine((cdCanvas*)NUM2UINT(v_canvas),x1,y1,x2,y2);
+	cdCanvasLine((cdCanvas*)NUM2ULONG(v_canvas),x1,y1,x2,y2);
 	return Qnil;
 }
 
@@ -562,7 +560,7 @@ VALUE rb_cdCanvasBegin(VALUE self,VALUE v_mode)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int mode = NUM2INT(v_mode);
-	cdCanvasBegin((cdCanvas*)NUM2UINT(v_canvas),mode);
+	cdCanvasBegin((cdCanvas*)NUM2ULONG(v_canvas),mode);
 	return Qnil;
 }
 
@@ -571,14 +569,14 @@ VALUE rb_cdCanvasVertex(VALUE self,VALUE v_x,VALUE v_y)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	cdCanvasVertex((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	cdCanvasVertex((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
 VALUE rb_cdCanvasEnd(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	cdCanvasEnd((cdCanvas*)NUM2UINT(v_canvas));
+	cdCanvasEnd((cdCanvas*)NUM2ULONG(v_canvas));
 	return Qnil;
 }
 
@@ -589,7 +587,7 @@ VALUE rb_cdCanvasRect(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdCanvasRect((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);
+	cdCanvasRect((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -600,7 +598,7 @@ VALUE rb_cdCanvasBox(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_y
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdCanvasBox((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);
+	cdCanvasBox((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -611,9 +609,9 @@ VALUE rb_cdCanvasArc(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VALUE
 	int yc = NUM2INT(v_yc);
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdCanvasArc((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdCanvasArc((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
@@ -624,9 +622,9 @@ VALUE rb_cdCanvasSector(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VAL
 	int yc = NUM2INT(v_yc);
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdCanvasSector((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdCanvasSector((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
@@ -637,9 +635,9 @@ VALUE rb_cdCanvasChord(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VALU
 	int yc = NUM2INT(v_yc);
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdCanvasChord((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdCanvasChord((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
@@ -648,99 +646,99 @@ VALUE rb_cdCanvasText(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	const char* s = RSTRING(v_s)->ptr;
-	cdCanvasText((cdCanvas*)NUM2UINT(v_canvas),x,y,s);
+	const char* s = RSTRING_PTR(v_s);
+	cdCanvasText((cdCanvas*)NUM2ULONG(v_canvas),x,y,s);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasLine(VALUE self,VALUE v_x1,VALUE v_y1,VALUE v_x2,VALUE v_y2)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double x1 = RFLOAT(v_x1)->value;
-	double y1 = RFLOAT(v_y1)->value;
-	double x2 = RFLOAT(v_x2)->value;
-	double y2 = RFLOAT(v_y2)->value;	
-	cdfCanvasLine((cdCanvas*)NUM2UINT(v_canvas),x1,y1,x2,y2);
+	double x1 = RFLOAT_VALUE(v_x1);
+	double y1 = RFLOAT_VALUE(v_y1);
+	double x2 = RFLOAT_VALUE(v_x2);
+	double y2 = RFLOAT_VALUE(v_y2);	
+	cdfCanvasLine((cdCanvas*)NUM2ULONG(v_canvas),x1,y1,x2,y2);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasVertex(VALUE self,VALUE v_x,VALUE v_y)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double x = RFLOAT(v_x)->value;
-	double y = RFLOAT(v_y)->value;
-	cdfCanvasVertex((cdCanvas*)NUM2UINT(v_canvas),x,y);
+	double x = RFLOAT_VALUE(v_x);
+	double y = RFLOAT_VALUE(v_y);
+	cdfCanvasVertex((cdCanvas*)NUM2ULONG(v_canvas),x,y);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasRect(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_ymax)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xmin = RFLOAT(v_xmin)->value;
-	double xmax = RFLOAT(v_xmax)->value;
-	double ymin = RFLOAT(v_ymin)->value;
-	double ymax = RFLOAT(v_ymax)->value;
-	cdfCanvasRect((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);
+	double xmin = RFLOAT_VALUE(v_xmin);
+	double xmax = RFLOAT_VALUE(v_xmax);
+	double ymin = RFLOAT_VALUE(v_ymin);
+	double ymax = RFLOAT_VALUE(v_ymax);
+	cdfCanvasRect((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasBox(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VALUE v_ymax)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xmin = RFLOAT(v_xmin)->value;
-	double xmax = RFLOAT(v_xmax)->value;
-	double ymin = RFLOAT(v_ymin)->value;
-	double ymax = RFLOAT(v_ymax)->value;
-	cdfCanvasBox((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax);
+	double xmin = RFLOAT_VALUE(v_xmin);
+	double xmax = RFLOAT_VALUE(v_xmax);
+	double ymin = RFLOAT_VALUE(v_ymin);
+	double ymax = RFLOAT_VALUE(v_ymax);
+	cdfCanvasBox((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasArc(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VALUE v_angle1,VALUE v_angle2)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xc = RFLOAT(v_xc)->value;
-	double yc = RFLOAT(v_yc)->value;
-	double w = RFLOAT(v_w)->value;
-	double h = RFLOAT(v_h)->value;
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdfCanvasArc((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double xc = RFLOAT_VALUE(v_xc);
+	double yc = RFLOAT_VALUE(v_yc);
+	double w = RFLOAT_VALUE(v_w);
+	double h = RFLOAT_VALUE(v_h);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdfCanvasArc((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasSector(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VALUE v_angle1,VALUE v_angle2)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xc = RFLOAT(v_xc)->value;
-	double yc = RFLOAT(v_yc)->value;
-	double w = RFLOAT(v_w)->value;
-	double h = RFLOAT(v_h)->value;
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdfCanvasSector((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double xc = RFLOAT_VALUE(v_xc);
+	double yc = RFLOAT_VALUE(v_yc);
+	double w = RFLOAT_VALUE(v_w);
+	double h = RFLOAT_VALUE(v_h);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdfCanvasSector((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasChord(VALUE self,VALUE v_xc,VALUE v_yc,VALUE v_w,VALUE v_h,VALUE v_angle1,VALUE v_angle2)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double xc = RFLOAT(v_xc)->value;
-	double yc = RFLOAT(v_yc)->value;
-	double w = RFLOAT(v_w)->value;
-	double h = RFLOAT(v_h)->value;
-	double angle1 = RFLOAT(v_angle1)->value;
-	double angle2 = RFLOAT(v_angle2)->value;
-	cdfCanvasChord((cdCanvas*)NUM2UINT(v_canvas),xc,yc,w,h,angle1,angle2);
+	double xc = RFLOAT_VALUE(v_xc);
+	double yc = RFLOAT_VALUE(v_yc);
+	double w = RFLOAT_VALUE(v_w);
+	double h = RFLOAT_VALUE(v_h);
+	double angle1 = RFLOAT_VALUE(v_angle1);
+	double angle2 = RFLOAT_VALUE(v_angle2);
+	cdfCanvasChord((cdCanvas*)NUM2ULONG(v_canvas),xc,yc,w,h,angle1,angle2);
 	return Qnil;
 }
 
 VALUE rb_cdfCanvasText(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double x = RFLOAT(v_x)->value;
-	double y = RFLOAT(v_y)->value;
-	const char* s = RSTRING(v_s)->ptr;
-	cdfCanvasText((cdCanvas*)NUM2UINT(v_canvas),x,y,s);
+	double x = RFLOAT_VALUE(v_x);
+	double y = RFLOAT_VALUE(v_y);
+	const char* s = RSTRING_PTR(v_s);
+	cdfCanvasText((cdCanvas*)NUM2ULONG(v_canvas),x,y,s);
 	return Qnil;
 }
 
@@ -748,7 +746,7 @@ VALUE rb_cdCanvasSetBackground(VALUE self,VALUE v_color)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	long color = NUM2LONG(v_color);
-	cdCanvasSetBackground((cdCanvas*)NUM2UINT(v_canvas),color);
+	cdCanvasSetBackground((cdCanvas*)NUM2ULONG(v_canvas),color);
 	return Qnil;
 }
 
@@ -756,7 +754,7 @@ VALUE rb_cdCanvasSetForeground(VALUE self,VALUE v_color)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	long color = NUM2LONG(v_color);
-	cdCanvasSetForeground((cdCanvas*)NUM2UINT(v_canvas),color);
+	cdCanvasSetForeground((cdCanvas*)NUM2ULONG(v_canvas),color);
 	return Qnil;
 }
 
@@ -765,8 +763,8 @@ VALUE rb_cdCanvasBackground(VALUE self,VALUE v_color)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	long color = NUM2LONG(v_color);
 	long v;
-	v = cdCanvasBackground((cdCanvas*)NUM2UINT(v_canvas),color);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasBackground((cdCanvas*)NUM2ULONG(v_canvas),color);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasForeground(VALUE self,VALUE v_color)
@@ -774,8 +772,8 @@ VALUE rb_cdCanvasForeground(VALUE self,VALUE v_color)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	long color = NUM2LONG(v_color);
 	long v;
-	v = cdCanvasForeground((cdCanvas*)NUM2UINT(v_canvas),color);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasForeground((cdCanvas*)NUM2ULONG(v_canvas),color);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasBackOpacity(VALUE self,VALUE v_opacity)
@@ -783,8 +781,8 @@ VALUE rb_cdCanvasBackOpacity(VALUE self,VALUE v_opacity)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int opacity = NUM2INT(v_opacity);
 	int v;
-	v = cdCanvasBackOpacity((cdCanvas*)NUM2UINT(v_canvas),opacity);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasBackOpacity((cdCanvas*)NUM2ULONG(v_canvas),opacity);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasWriteMode(VALUE self,VALUE v_mode)
@@ -792,8 +790,8 @@ VALUE rb_cdCanvasWriteMode(VALUE self,VALUE v_mode)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int mode = NUM2INT(v_mode);
 	int v;
-	v = cdCanvasWriteMode((cdCanvas*)NUM2UINT(v_canvas),mode);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasWriteMode((cdCanvas*)NUM2ULONG(v_canvas),mode);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasLineStyle(VALUE self,VALUE v_style)
@@ -801,8 +799,8 @@ VALUE rb_cdCanvasLineStyle(VALUE self,VALUE v_style)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int style = NUM2INT(v_style);
 	int v;
-	v = cdCanvasLineStyle((cdCanvas*)NUM2UINT(v_canvas),style);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasLineStyle((cdCanvas*)NUM2ULONG(v_canvas),style);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasLineStyleDashes(VALUE self,VALUE v_dashes)
@@ -810,10 +808,10 @@ VALUE rb_cdCanvasLineStyleDashes(VALUE self,VALUE v_dashes)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int dashes[100];
 	int i;
-	int count = RARRAY(v_dashes)->len;
+	int count = RARRAY_LEN(v_dashes);
 	for(i=0;i<count;i++)
-	  dashes[i] = NUM2INT(RARRAY(v_dashes)->ptr[i]);
-	cdCanvasLineStyleDashes((cdCanvas*)NUM2UINT(v_canvas),dashes,count);
+	  dashes[i] = NUM2INT(RARRAY_PTR(v_dashes)[i]);
+	cdCanvasLineStyleDashes((cdCanvas*)NUM2ULONG(v_canvas),dashes,count);
 	return Qnil;
 }
 
@@ -822,8 +820,8 @@ VALUE rb_cdCanvasLineWidth(VALUE self,VALUE v_width)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int width = NUM2INT(v_width);
 	int v;
-	v = cdCanvasLineWidth((cdCanvas*)NUM2UINT(v_canvas),width);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasLineWidth((cdCanvas*)NUM2ULONG(v_canvas),width);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasLineJoin(VALUE self,VALUE v_join)
@@ -831,8 +829,8 @@ VALUE rb_cdCanvasLineJoin(VALUE self,VALUE v_join)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int join = NUM2INT(v_join);
 	int v;
-	v = cdCanvasLineJoin((cdCanvas*)NUM2UINT(v_canvas),join);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasLineJoin((cdCanvas*)NUM2ULONG(v_canvas),join);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasLineCap(VALUE self,VALUE v_cap)
@@ -840,8 +838,8 @@ VALUE rb_cdCanvasLineCap(VALUE self,VALUE v_cap)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int cap = NUM2INT(v_cap);
 	int v;
-	v = cdCanvasLineCap((cdCanvas*)NUM2UINT(v_canvas),cap);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasLineCap((cdCanvas*)NUM2ULONG(v_canvas),cap);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasInteriorStyle(VALUE self,VALUE v_style)
@@ -849,8 +847,8 @@ VALUE rb_cdCanvasInteriorStyle(VALUE self,VALUE v_style)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int style = NUM2INT(v_style);
 	int v;
-	v = cdCanvasInteriorStyle((cdCanvas*)NUM2UINT(v_canvas),style);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasInteriorStyle((cdCanvas*)NUM2ULONG(v_canvas),style);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasHatch(VALUE self,VALUE v_style)
@@ -858,8 +856,8 @@ VALUE rb_cdCanvasHatch(VALUE self,VALUE v_style)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int style = NUM2INT(v_style);
 	int v;
-	v = cdCanvasHatch((cdCanvas*)NUM2UINT(v_canvas),style);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasHatch((cdCanvas*)NUM2ULONG(v_canvas),style);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasStipple(VALUE self,VALUE v_w,VALUE v_h,VALUE v_stipple)
@@ -867,8 +865,8 @@ VALUE rb_cdCanvasStipple(VALUE self,VALUE v_w,VALUE v_h,VALUE v_stipple)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
-	const unsigned char* stipple = (unsigned char*)RSTRING(v_stipple)->ptr;
-	cdCanvasStipple((cdCanvas*)NUM2UINT(v_canvas),w,h,stipple);
+	const unsigned char* stipple = (unsigned char*)RSTRING_PTR(v_stipple);
+	cdCanvasStipple((cdCanvas*)NUM2ULONG(v_canvas),w,h,stipple);
 	return Qnil;
 }
 
@@ -879,7 +877,7 @@ VALUE rb_cdCanvasGetStipple(VALUE self)
 	int m;
 	char* v;
 	VALUE v_r;
-	v = (char*)cdCanvasGetStipple((cdCanvas*)NUM2UINT(v_canvas),&n,&m);
+	v = (char*)cdCanvasGetStipple((cdCanvas*)NUM2ULONG(v_canvas),&n,&m);
 	v_r = rb_ary_new3(3,rb_str_new(v,n*m),INT2FIX(n),INT2FIX(m));
 	return v_r;
 }
@@ -891,9 +889,9 @@ VALUE rb_cdCanvasPattern(VALUE self,VALUE v_w,VALUE v_h,VALUE v_pattern)
 	int h = NUM2INT(v_h);
 	long int pattern[100];
 	int i;
-	for(i=0;i<w*h && i<RARRAY(v_pattern)->len;i++)
-		pattern[i] = NUM2LONG(RARRAY(v_pattern)->ptr[i]);
-	cdCanvasPattern((cdCanvas*)NUM2UINT(v_canvas),w,h,pattern);
+	for(i=0;i<w*h && i<RARRAY_LEN(v_pattern);i++)
+		pattern[i] = NUM2LONG(RARRAY_PTR(v_pattern)[i]);
+	cdCanvasPattern((cdCanvas*)NUM2ULONG(v_canvas),w,h,pattern);
 	return Qnil;
 }
 
@@ -905,7 +903,7 @@ VALUE rb_cdCanvasGetPattern(VALUE self)
 	long* v;
 	int i;
 	VALUE v_r,v_p;
-	v = cdCanvasGetPattern((cdCanvas*)NUM2UINT(v_canvas),&n,&m);
+	v = cdCanvasGetPattern((cdCanvas*)NUM2ULONG(v_canvas),&n,&m);
 	v_p = rb_ary_new();
 	for(i=0;i<n*m;i++)
 		rb_ary_push(v_p,LONG2NUM(v[i]));
@@ -918,8 +916,8 @@ VALUE rb_cdCanvasFillMode(VALUE self,VALUE v_mode)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int mode = NUM2INT(v_mode);
 	int v;
-	v = cdCanvasFillMode((cdCanvas*)NUM2UINT(v_canvas),mode);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasFillMode((cdCanvas*)NUM2ULONG(v_canvas),mode);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasFont(VALUE self,VALUE v_type_face,VALUE v_style,VALUE v_size)
@@ -930,9 +928,9 @@ VALUE rb_cdCanvasFont(VALUE self,VALUE v_type_face,VALUE v_style,VALUE v_size)
 	int size = NUM2INT(v_size);
 	int v;
 	if(v_type_face!=Qnil)
-		type_face = RSTRING(v_type_face)->ptr;
-	v = cdCanvasFont((cdCanvas*)NUM2UINT(v_canvas),type_face,style,size);
-	return UINT2NUM((unsigned)v);
+		type_face = RSTRING_PTR(v_type_face);
+	v = cdCanvasFont((cdCanvas*)NUM2ULONG(v_canvas),type_face,style,size);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasGetFont(VALUE self)
@@ -942,7 +940,7 @@ VALUE rb_cdCanvasGetFont(VALUE self)
 	int style;
 	int size;
 	VALUE v_r;
-	cdCanvasGetFont((cdCanvas*)NUM2UINT(v_canvas),type_face,&style,&size);
+	cdCanvasGetFont((cdCanvas*)NUM2ULONG(v_canvas),type_face,&style,&size);
 	v_r = rb_ary_new3(3,rb_str_new2(type_face),INT2FIX(style),INT2FIX(size));
 	return Qnil;
 }
@@ -950,9 +948,9 @@ VALUE rb_cdCanvasGetFont(VALUE self)
 VALUE rb_cdCanvasNativeFont(VALUE self,VALUE v_font)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	const char* font = RSTRING(v_font)->ptr;
+	const char* font = RSTRING_PTR(v_font);
 	char* v;
-	v = cdCanvasNativeFont((cdCanvas*)NUM2UINT(v_canvas),font);
+	v = cdCanvasNativeFont((cdCanvas*)NUM2ULONG(v_canvas),font);
 	return  rb_str_new2(v);
 }
 
@@ -961,17 +959,17 @@ VALUE rb_cdCanvasTextAlignment(VALUE self,VALUE v_alignment)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int alignment = NUM2INT(v_alignment);
 	int v;
-	v = cdCanvasTextAlignment((cdCanvas*)NUM2UINT(v_canvas),alignment);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasTextAlignment((cdCanvas*)NUM2ULONG(v_canvas),alignment);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasTextOrientation(VALUE self,VALUE v_angle)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	double angle = RFLOAT(v_angle)->value;
+	double angle = RFLOAT_VALUE(v_angle);
 	double v;
-	v = cdCanvasTextOrientation((cdCanvas*)NUM2UINT(v_canvas),angle);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasTextOrientation((cdCanvas*)NUM2ULONG(v_canvas),angle);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasMarkType(VALUE self,VALUE v_type)
@@ -979,8 +977,8 @@ VALUE rb_cdCanvasMarkType(VALUE self,VALUE v_type)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int type = NUM2INT(v_type);
 	int v;
-	v = cdCanvasMarkType((cdCanvas*)NUM2UINT(v_canvas),type);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasMarkType((cdCanvas*)NUM2ULONG(v_canvas),type);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasMarkSize(VALUE self,VALUE v_size)
@@ -988,8 +986,8 @@ VALUE rb_cdCanvasMarkSize(VALUE self,VALUE v_size)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int size = NUM2INT(v_size);
 	int v;
-	v = cdCanvasMarkSize((cdCanvas*)NUM2UINT(v_canvas),size);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasMarkSize((cdCanvas*)NUM2ULONG(v_canvas),size);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasVectorText(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
@@ -997,8 +995,8 @@ VALUE rb_cdCanvasVectorText(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	const char* s = RSTRING(v_s)->ptr;
-	cdCanvasVectorText((cdCanvas*)NUM2UINT(v_canvas),x,y,s);
+	const char* s = RSTRING_PTR(v_s);
+	cdCanvasVectorText((cdCanvas*)NUM2ULONG(v_canvas),x,y,s);
 	return Qnil;
 }
 
@@ -1007,8 +1005,8 @@ VALUE rb_cdCanvasMultiLineVectorText(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	const char* s = RSTRING(v_s)->ptr;
-	cdCanvasMultiLineVectorText((cdCanvas*)NUM2UINT(v_canvas),x,y,s);
+	const char* s = RSTRING_PTR(v_s);
+	cdCanvasMultiLineVectorText((cdCanvas*)NUM2ULONG(v_canvas),x,y,s);
 	return Qnil;
 }
 
@@ -1017,8 +1015,8 @@ VALUE rb_cdCanvasVectorFont(VALUE self,VALUE v_filename)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	const char *filename = NULL;
 	char *v;
-	if(v_filename!=Qnil) filename = RSTRING(v_filename)->ptr;
-	v = cdCanvasVectorFont((cdCanvas*)NUM2UINT(v_canvas),filename);
+	if(v_filename!=Qnil) filename = RSTRING_PTR(v_filename);
+	v = cdCanvasVectorFont((cdCanvas*)NUM2ULONG(v_canvas),filename);
 	if(v==NULL) return Qnil;
 	return rb_str_new2(v);
 }
@@ -1030,7 +1028,7 @@ VALUE rb_cdCanvasVectorTextDirection(VALUE self,VALUE v_x1,VALUE v_y1,VALUE v_x2
 	int y1 = NUM2INT(v_y1);
 	int x2 = NUM2INT(v_x2);
 	int y2 = NUM2INT(v_y2);
-	cdCanvasVectorTextDirection((cdCanvas*)NUM2UINT(v_canvas),x1,y1,x2,y2);
+	cdCanvasVectorTextDirection((cdCanvas*)NUM2ULONG(v_canvas),x1,y1,x2,y2);
 	return Qnil;
 }
 
@@ -1043,10 +1041,10 @@ VALUE rb_cdCanvasVectorTextTransform(VALUE self,VALUE v_matrix)
 	VALUE v_r;
 	if(v_matrix!=Qnil) {
 		matrix = xmalloc(sizeof(double)*6);
-		for(i=0;i<RARRAY(v_matrix)->len && i<6;i++)
-		  	matrix[i] = RFLOAT(RARRAY(v_matrix)->ptr[i])->value;
+		for(i=0;i<RARRAY_LEN(v_matrix) && i<6;i++)
+		  	matrix[i] = RFLOAT_VALUE(RARRAY_PTR(v_matrix)[i]);
 	}
-	v = cdCanvasVectorTextTransform((cdCanvas*)NUM2UINT(v_canvas),matrix);
+	v = cdCanvasVectorTextTransform((cdCanvas*)NUM2ULONG(v_canvas),matrix);
 	if(matrix) free(matrix);
 	v_r = rb_ary_new();
 	for(i=0;i<6;i++)
@@ -1059,8 +1057,8 @@ VALUE rb_cdCanvasVectorTextSize(VALUE self,VALUE v_size_x,VALUE v_size_y,VALUE v
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int size_x = NUM2INT(v_size_x);
 	int size_y = NUM2INT(v_size_y);
-	const char* s = RSTRING(v_s)->ptr;
-	cdCanvasVectorTextSize((cdCanvas*)NUM2UINT(v_canvas),size_x,size_y,s);
+	const char* s = RSTRING_PTR(v_s);
+	cdCanvasVectorTextSize((cdCanvas*)NUM2ULONG(v_canvas),size_x,size_y,s);
 	return Qnil;
 }
 
@@ -1069,18 +1067,18 @@ VALUE rb_cdCanvasVectorCharSize(VALUE self,VALUE v_size)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int size = NUM2INT(v_size);
 	int v;
-	v = cdCanvasVectorCharSize((cdCanvas*)NUM2UINT(v_canvas),size);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasVectorCharSize((cdCanvas*)NUM2ULONG(v_canvas),size);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasGetVectorTextSize(VALUE self,VALUE v_s)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	const char* s = RSTRING(v_s)->ptr;
+	const char* s = RSTRING_PTR(v_s);
 	int x;
 	int y;
 	VALUE v_r;
-	cdCanvasGetVectorTextSize((cdCanvas*)NUM2UINT(v_canvas),s,&x,&y);
+	cdCanvasGetVectorTextSize((cdCanvas*)NUM2ULONG(v_canvas),s,&x,&y);
 	v_r = rb_ary_new3(2,INT2FIX(x),INT2FIX(y));
 	return Qnil;
 }
@@ -1088,13 +1086,13 @@ VALUE rb_cdCanvasGetVectorTextSize(VALUE self,VALUE v_s)
 VALUE rb_cdCanvasGetVectorTextBounds(VALUE self,VALUE v_s,VALUE v_x,VALUE v_y)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	const char* s = RSTRING(v_s)->ptr;
+	const char* s = RSTRING_PTR(v_s);
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
 	int rect[8];
 	VALUE v_r;
 	int i;
-	cdCanvasGetVectorTextBounds((cdCanvas*)NUM2UINT(v_canvas),s,x,y,rect);
+	cdCanvasGetVectorTextBounds((cdCanvas*)NUM2ULONG(v_canvas),s,x,y,rect);
 	v_r = rb_ary_new();
 	for(i=0;i<8;i++)
 		rb_ary_push(v_r,INT2FIX(rect[i]));
@@ -1109,7 +1107,7 @@ VALUE rb_cdCanvasGetFontDim(VALUE self)
 	int ascent;
 	int descent;
 	VALUE v_r;
-	cdCanvasGetFontDim((cdCanvas*)NUM2UINT(v_canvas),&max_width,&height,&ascent,&descent);
+	cdCanvasGetFontDim((cdCanvas*)NUM2ULONG(v_canvas),&max_width,&height,&ascent,&descent);
 	v_r = rb_ary_new3(4,INT2FIX(max_width),INT2FIX(height),INT2FIX(ascent),INT2FIX(descent));
 	return v_r;
 }
@@ -1117,11 +1115,11 @@ VALUE rb_cdCanvasGetFontDim(VALUE self)
 VALUE rb_cdCanvasGetTextSize(VALUE self,VALUE v_s)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	const char* s = RSTRING(v_s)->ptr;
+	const char* s = RSTRING_PTR(v_s);
 	int width;
 	int height;
 	VALUE v_r;
-	cdCanvasGetTextSize((cdCanvas*)NUM2UINT(v_canvas),s,&width,&height);
+	cdCanvasGetTextSize((cdCanvas*)NUM2ULONG(v_canvas),s,&width,&height);
 	v_r = rb_ary_new3(2,INT2FIX(width),INT2FIX(height));
 	return v_r;
 }
@@ -1131,13 +1129,13 @@ VALUE rb_cdCanvasGetTextBox(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	const char* s = RSTRING(v_s)->ptr;
+	const char* s = RSTRING_PTR(v_s);
 	int xmin;
 	int xmax;
 	int ymin;
 	int ymax;
 	VALUE v_r;
-	cdCanvasGetTextBox((cdCanvas*)NUM2UINT(v_canvas),x,y,s,&xmin,&xmax,&ymin,&ymax);
+	cdCanvasGetTextBox((cdCanvas*)NUM2ULONG(v_canvas),x,y,s,&xmin,&xmax,&ymin,&ymax);
 	v_r = rb_ary_new3(4,INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax));
 	return v_r;
 }
@@ -1147,11 +1145,11 @@ VALUE rb_cdCanvasGetTextBounds(VALUE self,VALUE v_x,VALUE v_y,VALUE v_s)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	const char* s = RSTRING(v_s)->ptr;
+	const char* s = RSTRING_PTR(v_s);
 	int rect[8];
 	VALUE v_r;
 	int i;
-	cdCanvasGetTextBounds((cdCanvas*)NUM2UINT(v_canvas),x,y,s,rect);
+	cdCanvasGetTextBounds((cdCanvas*)NUM2ULONG(v_canvas),x,y,s,rect);
 	v_r = rb_ary_new();
 	for(i=0;i<8;i++)
 		rb_ary_push(v_r,INT2FIX(rect[i]));
@@ -1162,20 +1160,20 @@ VALUE rb_cdCanvasGetColorPlanes(VALUE self)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int v;
-	v = cdCanvasGetColorPlanes((cdCanvas*)NUM2UINT(v_canvas));
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasGetColorPlanes((cdCanvas*)NUM2ULONG(v_canvas));
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdCanvasPalette(VALUE self,VALUE v_palette,VALUE v_mode)
 {
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
-	int n = RARRAY(v_palette)->len;
+	int n = RARRAY_LEN(v_palette);
 	long int *palette = xmalloc(n*sizeof(long));
 	int mode = NUM2INT(v_mode);
 	int i;
 	for(i=0;i<n;i++)
-		palette[i] = NUM2LONG(RARRAY(v_palette)->ptr[i]);
-	cdCanvasPalette((cdCanvas*)NUM2UINT(v_canvas),n,palette,mode);
+		palette[i] = NUM2LONG(RARRAY_PTR(v_palette)[i]);
+	cdCanvasPalette((cdCanvas*)NUM2ULONG(v_canvas),n,palette,mode);
 	free(palette);
 	return Qnil;
 }
@@ -1191,7 +1189,7 @@ VALUE rb_cdCanvasGetImageRGB(VALUE self,VALUE v_x,VALUE v_y,VALUE v_w,VALUE v_h)
 	unsigned char* g = (unsigned char*)xmalloc(w*h);
 	unsigned char* b = (unsigned char*)xmalloc(w*h);
 	VALUE v_r;
-	cdCanvasGetImageRGB((cdCanvas*)NUM2UINT(v_canvas),r,g,b,x,y,w,h);
+	cdCanvasGetImageRGB((cdCanvas*)NUM2ULONG(v_canvas),r,g,b,x,y,w,h);
 	v_r = rb_ary_new3(rb_str_new((char*)r,w*h),rb_str_new((char*)g,w*h),rb_str_new((char*)b,w*h));
 	free(r);
 	free(g);
@@ -1204,9 +1202,9 @@ VALUE rb_cdCanvasPutImageRectRGB(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_r,VALU
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int iw = NUM2INT(v_iw);
 	int ih = NUM2INT(v_ih);
-	const unsigned char* r = (unsigned char*)RSTRING(v_r)->ptr;
-	const unsigned char* g = (unsigned char*)RSTRING(v_g)->ptr;
-	const unsigned char* b = (unsigned char*)RSTRING(v_b)->ptr;
+	const unsigned char* r = (unsigned char*)RSTRING_PTR(v_r);
+	const unsigned char* g = (unsigned char*)RSTRING_PTR(v_g);
+	const unsigned char* b = (unsigned char*)RSTRING_PTR(v_b);
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
 	int w = NUM2INT(v_w);
@@ -1215,7 +1213,7 @@ VALUE rb_cdCanvasPutImageRectRGB(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_r,VALU
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdCanvasPutImageRectRGB((cdCanvas*)NUM2UINT(v_canvas),iw,ih,r,g,b,x,y,w,h,xmin,xmax,ymin,ymax);
+	cdCanvasPutImageRectRGB((cdCanvas*)NUM2ULONG(v_canvas),iw,ih,r,g,b,x,y,w,h,xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -1224,9 +1222,9 @@ VALUE rb_cdCanvasPutImageRectRGBA(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_r,VAL
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int iw = NUM2INT(v_iw);
 	int ih = NUM2INT(v_ih);
-	const unsigned char* r = (unsigned char*)RSTRING(v_r)->ptr;
-	const unsigned char* g = (unsigned char*)RSTRING(v_g)->ptr;
-	const unsigned char* b = (unsigned char*)RSTRING(v_b)->ptr;
+	const unsigned char* r = (unsigned char*)RSTRING_PTR(v_r);
+	const unsigned char* g = (unsigned char*)RSTRING_PTR(v_g);
+	const unsigned char* b = (unsigned char*)RSTRING_PTR(v_b);
 	const unsigned char* a = NULL;
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
@@ -1236,8 +1234,8 @@ VALUE rb_cdCanvasPutImageRectRGBA(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_r,VAL
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	if(v_a!=Qnil) a = (unsigned char*)RSTRING(v_a)->ptr;
-	cdCanvasPutImageRectRGBA((cdCanvas*)NUM2UINT(v_canvas),iw,ih,r,g,b,a,x,y,w,h,xmin,xmax,ymin,ymax);
+	if(v_a!=Qnil) a = (unsigned char*)RSTRING_PTR(v_a);
+	cdCanvasPutImageRectRGBA((cdCanvas*)NUM2ULONG(v_canvas),iw,ih,r,g,b,a,x,y,w,h,xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -1246,8 +1244,8 @@ VALUE rb_cdCanvasPutImageRectMap(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_index,
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int iw = NUM2INT(v_iw);
 	int ih = NUM2INT(v_ih);
-	const unsigned char* index = (unsigned char*)RSTRING(v_index)->ptr;
-	long int *colors = xmalloc(RARRAY(v_colors)->len*sizeof(long));
+	const unsigned char* index = (unsigned char*)RSTRING_PTR(v_index);
+	long int *colors = xmalloc(RARRAY_LEN(v_colors)*sizeof(long));
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
 	int w = NUM2INT(v_w);
@@ -1257,9 +1255,9 @@ VALUE rb_cdCanvasPutImageRectMap(VALUE self,VALUE v_iw,VALUE v_ih,VALUE v_index,
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
 	int i;
-	for(i=0;i<RARRAY(v_colors)->len;i++)
-		colors[i] = NUM2LONG(RARRAY(v_colors)->ptr[i]);
-	cdCanvasPutImageRectMap((cdCanvas*)NUM2UINT(v_canvas),iw,ih,index,colors,x,y,w,h,xmin,xmax,ymin,ymax);
+	for(i=0;i<RARRAY_LEN(v_colors);i++)
+		colors[i] = NUM2LONG(RARRAY_PTR(v_colors)[i]);
+	cdCanvasPutImageRectMap((cdCanvas*)NUM2ULONG(v_canvas),iw,ih,index,colors,x,y,w,h,xmin,xmax,ymin,ymax);
 	free(colors);
 	return Qnil;
 }
@@ -1270,13 +1268,13 @@ VALUE rb_cdCanvasCreateImage(VALUE self,VALUE v_w,VALUE v_h)
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
 	cdImage* v;
-	v = cdCanvasCreateImage((cdCanvas*)NUM2UINT(v_canvas),w,h);
-	return UINT2NUM((unsigned)v);
+	v = cdCanvasCreateImage((cdCanvas*)NUM2ULONG(v_canvas),w,h);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdKillImage(VALUE self,VALUE v_image)
 {
-	cdImage* image = (cdImage*)NUM2UINT(v_image);
+	cdImage* image = (cdImage*)NUM2ULONG(v_image);
 	cdKillImage(image);
 	return Qnil;
 }
@@ -1286,8 +1284,8 @@ VALUE rb_cdCanvasGetImage(VALUE self,VALUE v_image,VALUE v_x,VALUE v_y)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	cdImage* image = (cdImage*)NUM2UINT(v_image);
-	cdCanvasGetImage((cdCanvas*)NUM2UINT(v_canvas),image,x,y);
+	cdImage* image = (cdImage*)NUM2ULONG(v_image);
+	cdCanvasGetImage((cdCanvas*)NUM2ULONG(v_canvas),image,x,y);
 	return Qnil;
 }
 
@@ -1300,8 +1298,8 @@ VALUE rb_cdCanvasPutImageRect(VALUE self,VALUE v_image,VALUE v_x,VALUE v_y,VALUE
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdImage* image = (cdImage*)NUM2UINT(v_image);
-	cdCanvasPutImageRect((cdCanvas*)NUM2UINT(v_canvas),image,x,y,xmin,xmax,ymin,ymax);
+	cdImage* image = (cdImage*)NUM2ULONG(v_image);
+	cdCanvasPutImageRect((cdCanvas*)NUM2ULONG(v_canvas),image,x,y,xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -1314,7 +1312,7 @@ VALUE rb_cdCanvasScrollArea(VALUE self,VALUE v_xmin,VALUE v_xmax,VALUE v_ymin,VA
 	int ymax = NUM2INT(v_ymax);
 	int dx = NUM2INT(v_dx);
 	int dy = NUM2INT(v_dy);
-	cdCanvasScrollArea((cdCanvas*)NUM2UINT(v_canvas),xmin,xmax,ymin,ymax,dx,dy);
+	cdCanvasScrollArea((cdCanvas*)NUM2ULONG(v_canvas),xmin,xmax,ymin,ymax,dx,dy);
 	return Qnil;
 }
 
@@ -1325,7 +1323,7 @@ VALUE rb_cdCreateBitmap(VALUE self,VALUE v_w,VALUE v_h,VALUE v_type)
 	int type = NUM2INT(v_type);
 	cdBitmap* v;
 	v = cdCreateBitmap(w,h,type);
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdInitBitmap(int argc,VALUE *argv,VALUE self)
@@ -1342,36 +1340,36 @@ VALUE rb_cdInitBitmap(int argc,VALUE *argv,VALUE self)
 	long int* colors = NULL;
 	int i;
 	if(type==CD_RGBA) {
-		red = (unsigned char*)RSTRING(argv[3])->ptr;
-		green = (unsigned char*)RSTRING(argv[4])->ptr;
-		blue = (unsigned char*)RSTRING(argv[5])->ptr;
-		alpha = (unsigned char*)RSTRING(argv[6])->ptr;
+		red = (unsigned char*)RSTRING_PTR(argv[3]);
+		green = (unsigned char*)RSTRING_PTR(argv[4]);
+		blue = (unsigned char*)RSTRING_PTR(argv[5]);
+		alpha = (unsigned char*)RSTRING_PTR(argv[6]);
 		v = cdInitBitmap(w,h,type,red,green,blue,alpha);
 	}
 	else if(type==CD_RGB) {
-		red = (unsigned char*)RSTRING(argv[3])->ptr;
-		green = (unsigned char*)RSTRING(argv[4])->ptr;
-		blue = (unsigned char*)RSTRING(argv[5])->ptr;
+		red = (unsigned char*)RSTRING_PTR(argv[3]);
+		green = (unsigned char*)RSTRING_PTR(argv[4]);
+		blue = (unsigned char*)RSTRING_PTR(argv[5]);
 		v = cdInitBitmap(w,h,type,red,green,blue);
 	}
 	else if(type==CD_MAP) {
-		index = (unsigned char*)RSTRING(argv[5])->ptr;		
-		colors = xmalloc(RARRAY(argv[4])->len);
-		for(i=0;i<RARRAY(argv[4])->len;i++)
-			colors[i] = RARRAY(argv[4])->ptr[i];
+		index = (unsigned char*)RSTRING_PTR(argv[5]);		
+		colors = xmalloc(RARRAY_LEN(argv[4]));
+		for(i=0;i<RARRAY_LEN(argv[4]);i++)
+			colors[i] = RARRAY_PTR(argv[4])[i];
 		v = cdInitBitmap(w,h,type,index,colors);
 	}
 	else {
 		rb_raise(rb_eArgError,"Invalid Argument");
 	}
 	if(colors) free(colors);
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 
 VALUE rb_cdKillBitmap(VALUE self,VALUE v_bitmap)
 {
-	cdKillBitmap((cdBitmap*)NUM2UINT(v_bitmap));
+	cdKillBitmap((cdBitmap*)NUM2ULONG(v_bitmap));
 	return Qnil;
 }
 
@@ -1379,7 +1377,7 @@ VALUE rb_cdBitmapGetData(VALUE self,VALUE v_bitmap,VALUE v_dataptr)
 {
 	int dataptr = NUM2INT(v_dataptr);
 	char* v;
-	v = (char*)cdBitmapGetData((cdBitmap*)NUM2UINT(v_bitmap),dataptr);
+	v = (char*)cdBitmapGetData((cdBitmap*)NUM2ULONG(v_bitmap),dataptr);
 	return  rb_str_new2(v);
 }
 
@@ -1389,7 +1387,7 @@ VALUE rb_cdBitmapSetRect(VALUE self,VALUE v_bitmap,VALUE v_xmin,VALUE v_xmax,VAL
 	int xmax = NUM2INT(v_xmax);
 	int ymin = NUM2INT(v_ymin);
 	int ymax = NUM2INT(v_ymax);
-	cdBitmapSetRect((cdBitmap*)NUM2UINT(v_bitmap),xmin,xmax,ymin,ymax);
+	cdBitmapSetRect((cdBitmap*)NUM2ULONG(v_bitmap),xmin,xmax,ymin,ymax);
 	return Qnil;
 }
 
@@ -1400,8 +1398,8 @@ VALUE rb_cdCanvasPutBitmap(VALUE self,VALUE v_bitmap,VALUE v_x,VALUE v_y,VALUE v
 	int y = NUM2INT(v_y);
 	int w = NUM2INT(v_w);
 	int h = NUM2INT(v_h);
-	cdBitmap* bitmap = (cdBitmap*)NUM2UINT(v_bitmap);
-	cdCanvasPutBitmap((cdCanvas*)NUM2UINT(v_canvas),bitmap,x,y,w,h);
+	cdBitmap* bitmap = (cdBitmap*)NUM2ULONG(v_bitmap);
+	cdCanvasPutBitmap((cdCanvas*)NUM2ULONG(v_canvas),bitmap,x,y,w,h);
 	return Qnil;
 }
 
@@ -1410,14 +1408,14 @@ VALUE rb_cdCanvasGetBitmap(VALUE self,VALUE v_bitmap,VALUE v_x,VALUE v_y)
 	VALUE v_canvas = rb_iv_get(self,"@canvas");
 	int x = NUM2INT(v_x);
 	int y = NUM2INT(v_y);
-	cdBitmap* bitmap = (cdBitmap*)NUM2UINT(v_bitmap);
-	cdCanvasGetBitmap((cdCanvas*)NUM2UINT(v_canvas),bitmap,x,y);
+	cdBitmap* bitmap = (cdBitmap*)NUM2ULONG(v_bitmap);
+	cdCanvasGetBitmap((cdCanvas*)NUM2ULONG(v_canvas),bitmap,x,y);
 	return Qnil;
 }
 
 VALUE rb_cdBitmapRGB2Map(VALUE self,VALUE v_bitmap_rgb,VALUE v_bitmap_map)
 {
-	cdBitmapRGB2Map((cdBitmap*)NUM2UINT(v_bitmap_rgb),(cdBitmap*)NUM2UINT(v_bitmap_map));
+	cdBitmapRGB2Map((cdBitmap*)NUM2ULONG(v_bitmap_rgb),(cdBitmap*)NUM2ULONG(v_bitmap_map));
 	return Qnil;
 }
 
@@ -1446,7 +1444,7 @@ VALUE rb_cdDecodeAlpha(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdDecodeAlpha((long)NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdEncodeAlpha(VALUE self,VALUE v_color,VALUE v_alpha)
@@ -1461,50 +1459,50 @@ VALUE rb_cdAlpha(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdAlpha(NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdReserved(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdReserved(NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdRed(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdRed(NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdGreen(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdGreen(NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdBlue(VALUE self,VALUE v_color)
 {
 	char v;
 	v = cdBlue(NUM2LONG(v_color));
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdRGB2Map(VALUE self,VALUE v_width,VALUE v_height,VALUE v_red,VALUE v_green,VALUE v_blue,VALUE v_index,VALUE v_pal_size,VALUE v_color)
 {
 	int width = NUM2INT(v_width);
 	int height = NUM2INT(v_height);
-	const unsigned char* red = (unsigned char*)RSTRING(v_red)->ptr;
-	const unsigned char* green = (unsigned char*)RSTRING(v_green)->ptr;
-	const unsigned char* blue = (unsigned char*)RSTRING(v_blue)->ptr;
-	unsigned char* index = (unsigned char*)RSTRING(v_index)->ptr;
+	const unsigned char* red = (unsigned char*)RSTRING_PTR(v_red);
+	const unsigned char* green = (unsigned char*)RSTRING_PTR(v_green);
+	const unsigned char* blue = (unsigned char*)RSTRING_PTR(v_blue);
+	unsigned char* index = (unsigned char*)RSTRING_PTR(v_index);
 	int pal_size = NUM2INT(v_pal_size);
 	int i;
-	long *color = xmalloc(RARRAY(v_color)->len*sizeof(long));
-	for(i=0;i<RARRAY(v_color)->len;i++)
-		color[i] = NUM2LONG(RARRAY(v_color)->ptr[i]);
+	long *color = xmalloc(RARRAY_LEN(v_color)*sizeof(long));
+	for(i=0;i<RARRAY_LEN(v_color);i++)
+		color[i] = NUM2LONG(RARRAY_PTR(v_color)[i]);
 	cdRGB2Map(width,height,red,green,blue,index,pal_size,color);
 	free(color);
 	return Qnil;
@@ -1514,12 +1512,12 @@ VALUE rb_cdContextIup()
 {
 	cdContext* v;
 	v = cdContextIup();
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }
 
 VALUE rb_cdContextPDF() 
 {
 	cdContext* v;
 	v = cdContextPDF();
-	return UINT2NUM((unsigned)v);
+	return ULONG2NUM((unsigned long)v);
 }