ruby-iup 0.0.2 → 0.1.0

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iup_pplot.h"
+#include "rb_iup.h"
 
 static int PPlotOpen = 0;
 VALUE rb_IupPPlotOpen(VALUE self)
@@ -19,7 +18,7 @@ VALUE rb_IupPPlot(VALUE self)
 	}
 	v = IupPPlot();
 	if(v)
-		return rb_funcall(rb_cIupPPlot,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupPPlot,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }
 
@@ -27,7 +26,7 @@ VALUE rb_IupPPlotBegin(VALUE node,VALUE v_strXdata)
 {
 	int strXdata = NUM2INT(v_strXdata);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupPPlotBegin((Ihandle*)NUM2UINT(v_ih),strXdata);
+	IupPPlotBegin((Ihandle*)NUM2ULONG(v_ih),strXdata);
 	return Qnil;
 }
 
@@ -38,12 +37,12 @@ VALUE rb_IupPPlotAdd(VALUE node,VALUE v_x,VALUE v_y)
 	if(TYPE(v_x)==T_FIXNUM)
 		x = NUM2INT(v_x);
 	else
-		x = RFLOAT(v_x)->value;
+		x = RFLOAT_VALUE(v_x);
 	if(TYPE(v_y)==T_FIXNUM)
 		y = NUM2INT(v_y);
 	else		
-		y = RFLOAT(v_y)->value;
-	IupPPlotAdd((Ihandle*)NUM2UINT(v_ih),x,y);
+		y = RFLOAT_VALUE(v_y);
+	IupPPlotAdd((Ihandle*)NUM2ULONG(v_ih),x,y);
 	return Qnil;
 }
 
@@ -51,15 +50,15 @@ VALUE rb_IupPPlotAddStr(VALUE node,VALUE v_x,VALUE v_y)
 {
 	float y;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	const char* x = RSTRING(v_x)->ptr;
+	const char* x = RSTRING_PTR(v_x);
 	if(TYPE(v_y)==T_FIXNUM)
 		y = NUM2INT(v_y);
 	else if(TYPE(v_y)==T_FLOAT)
-		y = RFLOAT(v_y)->value;
+		y = RFLOAT_VALUE(v_y);
 	else
 		y = 0;
 	
-	IupPPlotAddStr((Ihandle*)NUM2UINT(v_ih),x,y);
+	IupPPlotAddStr((Ihandle*)NUM2ULONG(v_ih),x,y);
 	return Qnil;
 }
 
@@ -67,7 +66,7 @@ VALUE rb_IupPPlotEnd(VALUE node)
 {
 	int v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupPPlotEnd((Ihandle*)NUM2UINT(v_ih));
+	v = IupPPlotEnd((Ihandle*)NUM2ULONG(v_ih));
 	return INT2FIX(v);
 }
 
@@ -76,10 +75,10 @@ VALUE rb_IupPPlotInsertStr(VALUE node,VALUE v_index,VALUE v_sample_index,VALUE v
 	float y;
 	int index = NUM2INT(v_index);
 	int sample_index = NUM2INT(v_sample_index);
-	const char* x = RSTRING(v_x)->ptr;
+	const char* x = RSTRING_PTR(v_x);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	y = RFLOAT(v_y)->value;
-	IupPPlotInsertStr((Ihandle*)NUM2UINT(v_ih),index,sample_index,x,y);
+	y = RFLOAT_VALUE(v_y);
+	IupPPlotInsertStr((Ihandle*)NUM2ULONG(v_ih),index,sample_index,x,y);
 	return Qnil;
 }
 
@@ -92,12 +91,12 @@ VALUE rb_IupPPlotInsert(VALUE node,VALUE v_index,VALUE v_sample_index,VALUE v_x,
 	if(TYPE(v_x)==T_FIXNUM)
 		x = NUM2INT(v_x);
 	else
-		x = RFLOAT(v_x)->value;
+		x = RFLOAT_VALUE(v_x);
 	if(TYPE(v_y)==T_FIXNUM)
 		y = NUM2INT(v_y);
 	else		
-		y = RFLOAT(v_y)->value;
-	IupPPlotInsert((Ihandle*)NUM2UINT(v_ih),index,sample_index,x,y);
+		y = RFLOAT_VALUE(v_y);
+	IupPPlotInsert((Ihandle*)NUM2ULONG(v_ih),index,sample_index,x,y);
 	return Qnil;
 }
 
@@ -110,20 +109,20 @@ VALUE rb_IupPPlotTransform(VALUE node,VALUE v_x,VALUE v_y)
 	if(TYPE(v_x)==T_FIXNUM)
 		x = NUM2INT(v_x);
 	else
-		x = RFLOAT(v_x)->value;
+		x = RFLOAT_VALUE(v_x);
 	if(TYPE(v_y)==T_FIXNUM)
 		y = NUM2INT(v_y);
 	else		
-		y = RFLOAT(v_y)->value;
-	IupPPlotTransform((Ihandle*)NUM2UINT(v_ih),x,y,&ix,&iy);
+		y = RFLOAT_VALUE(v_y);
+	IupPPlotTransform((Ihandle*)NUM2ULONG(v_ih),x,y,&ix,&iy);
 	v_r = rb_ary_new3(2,INT2FIX(ix),INT2FIX(iy));
 	return v_r;
 }
 
 VALUE rb_IupPPlotPaintTo(VALUE node,VALUE v_cnv)
 {
-	void* cnv = (void*)NUM2UINT(v_cnv);
+	void* cnv = (void*)NUM2ULONG(v_cnv);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupPPlotPaintTo((Ihandle*)NUM2UINT(v_ih),cnv);
+	IupPPlotPaintTo((Ihandle*)NUM2ULONG(v_ih),cnv);
 	return Qnil;
 }

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupcb.h"
+#include "rb_iup.h"
 
 VALUE rb_IupColorBrowser(VALUE self)
 {
@@ -9,6 +8,6 @@ VALUE rb_IupColorBrowser(VALUE self)
 	IupControlsOpen();
 	v = IupColorBrowser();
 	if(v)
-		return rb_funcall(rb_cIupColorBrowser,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupColorBrowser,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }

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

@@ -1,16 +1,16 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupcells.h"
-
+#include "rb_iup.h"
+ 
+void rb_set_attribute(Ihandle *v,VALUE arg);
 VALUE rb_IupCells(int argc,VALUE *argv, VALUE self)
 {
-	extern VALUE rb_cIupCells;
+	extern VALUE rb_cIupCells;	
 	Ihandle* v;
 	IupControlsOpen();
 	v = IupCells();
         if(argc==1 && TYPE(argv[0])==T_HASH)
                 rb_set_attribute(v,argv[0]);
 	if(v)
-		return rb_funcall(rb_cIupCells,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupCells,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupcolorbar.h"
+#include "rb_iup.h"
 
 VALUE rb_IupColorbar(VALUE self)
 {
@@ -9,6 +8,6 @@ VALUE rb_IupColorbar(VALUE self)
 	IupControlsOpen();
 	v = IupColorbar();
 	if(v)
-		return rb_funcall(rb_cIupColorbar,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupColorbar,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }

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

@@ -1,6 +1,6 @@
 #include <ruby.h>
 #include "iup.h"
-#include "iupcontrols.h"
+#include "rb_iup.h"
 
 VALUE rb_IupControlsOpen(VALUE self)
 {

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupdial.h"
+#include "rb_iup.h"
 
 VALUE rb_IupDial(int argc,VALUE *argv,VALUE self)
 {
@@ -14,12 +13,12 @@ VALUE rb_IupDial(int argc,VALUE *argv,VALUE self)
 		rb_scan_args(argc,argv,"10",&v_type);
 	}
 	if(v_type!=Qnil)
-		type = RSTRING(v_type)->ptr;
+		type = RSTRING_PTR(v_type);
 	IupControlsOpen();
 	v = IupDial(type);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	
 	if(v)
-		return rb_funcall(rb_cIupDial,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupDial,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupgauge.h"
+#include "rb_iup.h"
 
 VALUE rb_IupGauge(int argc,VALUE *argv,VALUE self)
 {
@@ -11,6 +10,6 @@ VALUE rb_IupGauge(int argc,VALUE *argv,VALUE self)
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	
 	if(v)
-		return rb_funcall(rb_cIupGauge,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupGauge,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }

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

@@ -1,5 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
+#include "rb_iup.h"
 
 VALUE rb_IupGetColor(VALUE self,VALUE v_x,VALUE v_y)
 {

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

@@ -1,24 +1,26 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupgetparam.h"
+#include "rb_iup.h"
 
 static char ParamAction[100];
+extern VALUE rb_cIupNode;
 
 static int _param_action(Ihandle* dialog, int param_index, void* user_data)
 {
 	VALUE v;
 	VALUE node;
-	node = rb_funcall(rb_cIupNode,rb_intern("new"),1,UINT2NUM((unsigned)dialog));
-	v = rb_funcall(rb_cObject,rb_intern(ParamAction),3,node,INT2FIX(param_index),UINT2NUM((unsigned)user_data));
+	node = rb_funcall(rb_cIupNode,rb_intern("new"),1,ULONG2NUM((unsigned long)dialog));
+	v = rb_funcall(rb_cObject,rb_intern(ParamAction),3,node,INT2FIX(param_index),ULONG2NUM((unsigned long)user_data));
 	return NUM2INT(v);
 }
 
 VALUE rb_IupGetParam(int argc,VALUE *argv,VALUE self)
 {
-	const char* title = RSTRING(argv[0])->ptr;
+	extern int iupGetParamCount(const char *format, int *param_extra);
+
+	const char* title = RSTRING_PTR(argv[0]);
 	Iparamcb action = NULL;
 	void* user_data = (void*)NUM2INT(argv[2]);
-	const char* format = RSTRING(argv[3])->ptr;
+	const char* format = RSTRING_PTR(argv[3]);
 	int param_count;
 	int param_extra;
 	void *param_data[50];
@@ -28,10 +30,10 @@ VALUE rb_IupGetParam(int argc,VALUE *argv,VALUE self)
         static char s[50][500];
         VALUE v_r;
 	if(argv[1]!=Qnil) {
-		strcpy(ParamAction,RSTRING(argv[1])->ptr);
+		strcpy(ParamAction,RSTRING_PTR(argv[1]));
 		action = (Iparamcb)_param_action;	
 	}
-        param_count = IupGetParamCount(format, &param_extra);
+        param_count = iupGetParamCount(format, &param_extra);
         for(i=0;i<param_count && i+4<argc;i++) {
         	switch(TYPE(argv[i+4])) {
         		case T_FIXNUM:
@@ -40,11 +42,11 @@ VALUE rb_IupGetParam(int argc,VALUE *argv,VALUE self)
         			param_data[i] = (void*)&n[i];
         			break;
         		case T_FLOAT:
-        			d[i] = RFLOAT(argv[i+4])->value;
+        			d[i] = RFLOAT_VALUE(argv[i+4]);
         			param_data[i] = (void*)&d[i];
         			break;
         		case T_STRING:
-        			strcpy(s[i],RSTRING(argv[i+4])->ptr);
+        			strcpy(s[i],RSTRING_PTR(argv[i+4]));
         			param_data[i] = s[i];
         			break;
         	}        	

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

@@ -1,6 +1,6 @@
 #include <ruby.h>
 #include "iup.h"
-#include "iupgl.h"
+#include "rb_iup.h"
 
 VALUE rb_IupGLCanvasOpen(VALUE self)
 {
@@ -16,17 +16,17 @@ VALUE rb_IupGLCanvas(int argc,VALUE *argv,VALUE self)
 	VALUE v_action;
         IupGLCanvasOpen();
 	rb_scan_args(argc,argv,"01",&v_action);
-	if(v_action!=Qnil) action = RSTRING(v_action)->ptr;
+	if(v_action!=Qnil) action = RSTRING_PTR(v_action);
 	v = IupGLCanvas(action);
 	if(v)
-		return rb_funcall(rb_cIupGLCanvas,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupGLCanvas,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }
 
 VALUE rb_IupGLMakeCurrent(VALUE self,VALUE node)
 {
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupGLMakeCurrent((Ihandle*)NUM2UINT(v_ih));
+	IupGLMakeCurrent((Ihandle*)NUM2ULONG(v_ih));
 	return Qnil;
 }
 
@@ -34,14 +34,14 @@ VALUE rb_IupGLIsCurrent(VALUE self,VALUE node)
 {
 	int v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupGLIsCurrent((Ihandle*)NUM2UINT(v_ih));
+	v = IupGLIsCurrent((Ihandle*)NUM2ULONG(v_ih));
 	return INT2FIX((int)v);
 }
 
 VALUE rb_IupGLSwapBuffers(VALUE self,VALUE node)
 {
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupGLSwapBuffers((Ihandle*)NUM2UINT(v_ih));
+	IupGLSwapBuffers((Ihandle*)NUM2ULONG(v_ih));
 	return Qnil;
 }
 
@@ -50,9 +50,9 @@ VALUE rb_IupGLPalette(VALUE self,VALUE node,VALUE v_index,VALUE v_r,VALUE v_g,VA
 	float r,g,b;
 	int index = NUM2INT(v_index);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	r = RFLOAT(v_r)->value;
-	g = RFLOAT(v_g)->value;
-	b = RFLOAT(v_b)->value;
-	IupGLPalette((Ihandle*)NUM2UINT(v_ih),index,r,g,b);
+	r = RFLOAT_VALUE(v_r);
+	g = RFLOAT_VALUE(v_g);
+	b = RFLOAT_VALUE(v_b);
+	IupGLPalette((Ihandle*)NUM2ULONG(v_ih),index,r,g,b);
 	return Qnil;
 }

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

@@ -1,25 +1,25 @@
 #include <ruby.h>
 #include "iup.h"
-#include "iupim.h"
+#include "rb_iup.h"
 
 VALUE rb_IupLoadImage(VALUE self,VALUE v_file_name)
 {
 	extern VALUE rb_cIupImage;
-	const char* file_name = RSTRING(v_file_name)->ptr;
+	const char* file_name = RSTRING_PTR(v_file_name);
 	Ihandle* v;
 	v = IupLoadImage(file_name);
 	if(v)
-		return rb_funcall(rb_cIupImage,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupImage,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }
 
 VALUE rb_IupSaveImage(VALUE self,VALUE node,VALUE v_file_name,VALUE v_format)
 {
-	const char* file_name = RSTRING(v_file_name)->ptr;
-	const char* format = RSTRING(v_format)->ptr;
+	const char* file_name = RSTRING_PTR(v_file_name);
+	const char* format = RSTRING_PTR(v_format);
 	int v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupSaveImage((Ihandle*)NUM2UINT(v_ih),file_name,format);
+	v = IupSaveImage((Ihandle*)NUM2ULONG(v_ih),file_name,format);
 	return INT2FIX((int)v);
 }
 

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

@@ -1,6 +1,5 @@
 #include <ruby.h>
-#include "iup.h"
-#include "iupmatrix.h"
+#include "rb_iup.h"
 
 VALUE rb_IupMatrix(int argc,VALUE *argv,VALUE self)
 {
@@ -14,68 +13,68 @@ VALUE rb_IupMatrix(int argc,VALUE *argv,VALUE self)
 		rb_scan_args(argc,argv,"01",&v_action);
 	}
 	if(v_action!=Qnil)
-		action = RSTRING(v_action)->ptr;
+		action = RSTRING_PTR(v_action);
 	IupControlsOpen();
 	v = IupMatrix(action);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	
 	if(v)
-		return rb_funcall(rb_cIupMatrix,rb_intern("new"),1,UINT2NUM((unsigned)v));
+		return rb_funcall(rb_cIupMatrix,rb_intern("new"),1,ULONG2NUM((unsigned long)v));
 	return Qnil;
 }
 
 VALUE rb_IupMatSetAttribute(VALUE node,VALUE v_a,VALUE v_l,VALUE v_c,VALUE v_v)
 {
-	const char* a = RSTRING(v_a)->ptr;
+	const char* a = RSTRING_PTR(v_a);
 	int l = NUM2INT(v_l);
 	int c = NUM2INT(v_c);
-	char* v = RSTRING(v_v)->ptr;
+	char* v = RSTRING_PTR(v_v);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupMatSetAttribute((Ihandle*)NUM2UINT(v_ih),a,l,c,v);
+	IupMatSetAttribute((Ihandle*)NUM2ULONG(v_ih),a,l,c,v);
 	return Qnil;
 }
 
 VALUE rb_IupMatStoreAttribute(VALUE node,VALUE v_a,VALUE v_l,VALUE v_c,VALUE v_v)
 {
-	const char* a = RSTRING(v_a)->ptr;
+	const char* a = RSTRING_PTR(v_a);
 	int l = NUM2INT(v_l);
 	int c = NUM2INT(v_c);
-	char* v = RSTRING(v_v)->ptr;
+	char* v = RSTRING_PTR(v_v);
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	IupMatStoreAttribute((Ihandle*)NUM2UINT(v_ih),a,l,c,v);
+	IupMatStoreAttribute((Ihandle*)NUM2ULONG(v_ih),a,l,c,v);
 	return Qnil;
 }
 
 VALUE rb_IupMatGetAttribute(VALUE node,VALUE v_a,VALUE v_l,VALUE v_c)
 {
-	const char* a = RSTRING(v_a)->ptr;
+	const char* a = RSTRING_PTR(v_a);
 	int l = NUM2INT(v_l);
 	int c = NUM2INT(v_c);
 	char* v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupMatGetAttribute((Ihandle*)NUM2UINT(v_ih),a,l,c);
+	v = IupMatGetAttribute((Ihandle*)NUM2ULONG(v_ih),a,l,c);
 	return  rb_str_new2(v);
 }
 
 VALUE rb_IupMatGetInt(VALUE node,VALUE v_a,VALUE v_l,VALUE v_c)
 {
-	const char* a = RSTRING(v_a)->ptr;
+	const char* a = RSTRING_PTR(v_a);
 	int l = NUM2INT(v_l);
 	int c = NUM2INT(v_c);
 	int v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupMatGetInt((Ihandle*)NUM2UINT(v_ih),a,l,c);
+	v = IupMatGetInt((Ihandle*)NUM2ULONG(v_ih),a,l,c);
 	return INT2FIX(v);
 }
 
 VALUE rb_IupMatGetFloat(VALUE node,VALUE v_a,VALUE v_l,VALUE v_c)
 {
-	const char* a = RSTRING(v_a)->ptr;
+	const char* a = RSTRING_PTR(v_a);
 	int l = NUM2INT(v_l);
 	int c = NUM2INT(v_c);
 	float v;
 	VALUE v_ih = rb_iv_get(node,"@ihandle");
-	v = IupMatGetFloat((Ihandle*)NUM2UINT(v_ih),a,l,c);
+	v = IupMatGetFloat((Ihandle*)NUM2ULONG(v_ih),a,l,c);
 	return INT2FIX(v);
 }