ruby-iup 0.0.1-i386-mswin32 → 0.0.2-i386-mswin32

data/ext/iup.c

@@ -3,7 +3,6 @@
 #include "rb_iup.h"
 
 #include "rb_iupcb.h"
-#include "rb_iupcbox.h"
 #include "rb_iupcells.h"
 #include "rb_iupcolorbar.h"
 #include "rb_iupcontrols.h"
@@ -16,7 +15,6 @@
 #include "rb_iupmask.h"
 #include "rb_iupmatrix.h"
 #include "rb_iupsbox.h"
-#include "rb_iupspeech.h"
 #include "rb_iupspin.h"
 #include "rb_iuptabs.h"
 #include "rb_iuptree.h"
@@ -32,7 +30,7 @@
 
 DLLEXPORT void Init_iup()
 {
-	VALUE VERSION = rb_str_new2("0.0.1");
+	VALUE VERSION = rb_str_new2("0.0.2");
 	rb_mIup = rb_define_module("Iup");	
 	rb_mCd = rb_define_module("Cd");
 	rb_define_const(rb_mIup, "RUBY_IUP_VERSION", VERSION);
@@ -78,6 +76,7 @@ DLLEXPORT void Init_iup()
 	rb_cIupPPlot = rb_define_class_under(rb_mIup, "PPlot", rb_cIupCanvas); 
 	rb_cIupVal = rb_define_class_under(rb_mIup, "Val", rb_cIupCanvas); 
 	rb_cIupTimer = rb_define_class_under(rb_mIup, "Timer", rb_cIupNode); 
+	rb_cIupProgressBar = rb_define_class_under(rb_mIup, "ProgressBar", rb_cIupNode); 
 	
 	rb_define_const(rb_mIup, "NAME", rb_str_new2(IUP_NAME));
 	rb_define_const(rb_mIup, "COPYRIGHT", rb_str_new2(IUP_COPYRIGHT));
@@ -206,6 +205,7 @@ DLLEXPORT void Init_iup()
 	rb_define_module_function(rb_mIup, "MultiLine", rb_IupMultiLine, -1);
 	rb_define_module_function(rb_mIup, "Toggle", rb_IupToggle, -1);
 	rb_define_module_function(rb_mIup, "Timer", rb_IupTimer, 0);
+	rb_define_module_function(rb_mIup, "ProgressBar", rb_IupProgressBar, 0);
 	rb_define_const(rb_mIup, "ERROR", INT2FIX(IUP_ERROR));
 	rb_define_const(rb_mIup, "NOERROR", INT2FIX(IUP_NOERROR));
 	rb_define_const(rb_mIup, "OPENED", INT2FIX(IUP_OPENED));
@@ -229,58 +229,12 @@ DLLEXPORT void Init_iup()
 	rb_define_const(rb_mIup, "BUTTON5", INT2FIX(IUP_BUTTON5));
  
 	rb_define_module_function(rb_mIup, "ColorBrowser", rb_IupColorBrowser, 0);
-	rb_define_const(rb_mIup, "RGB", rb_str_new2(IUP_RGB));
-	rb_define_const(rb_mIup, "CHANGE_CB", rb_str_new2(IUP_CHANGE_CB));
-	rb_define_const(rb_mIup, "DRAG_CB", rb_str_new2(IUP_DRAG_CB));
 
 	rb_define_module_function(rb_mIup, "Cbox", rb_IupCboxv, -1);
-	rb_define_module_function(rb_mIup, "CboxBuilder", rb_IupCboxBuilderv, 1);
 
 	rb_define_const(rb_mIup, "OUT", INT2FIX(IUP_OUT));
-	rb_define_const(rb_mIup, "ALL", rb_str_new2(IUP_ALL));
-	rb_define_const(rb_mIup, "BOXED", rb_str_new2(IUP_BOXED));
-	rb_define_const(rb_mIup, "CLIPPED", rb_str_new2(IUP_CLIPPED));
-	rb_define_const(rb_mIup, "TRANSPARENT", rb_str_new2(IUP_TRANSPARENT));
-	rb_define_const(rb_mIup, "NON_SCROLLABLE_LINES", rb_str_new2(IUP_NON_SCROLLABLE_LINES));
-	rb_define_const(rb_mIup, "NON_SCROLLABLE_COLS", rb_str_new2(IUP_NON_SCROLLABLE_COLS));
-	rb_define_const(rb_mIup, "ORIGIN", rb_str_new2(IUP_ORIGIN));
-	rb_define_const(rb_mIup, "NO_COLOR", rb_str_new2(IUP_NO_COLOR));
-	rb_define_const(rb_mIup, "FIRST_LINE", rb_str_new2(IUP_FIRST_LINE));
-	rb_define_const(rb_mIup, "FIRST_COL", rb_str_new2(IUP_FIRST_COL));
-	rb_define_const(rb_mIup, "DOUBLE_BUFFER", rb_str_new2(IUP_DOUBLE_BUFFER));
-	rb_define_const(rb_mIup, "BUFFERIZE", rb_str_new2(IUP_BUFFERIZE));
-	rb_define_const(rb_mIup, "REPAINT", rb_str_new2(IUP_REPAINT));
-	rb_define_const(rb_mIup, "LIMITS", rb_str_new2(IUP_LIMITS));
-	rb_define_const(rb_mIup, "CANVAS", rb_str_new2(IUP_CANVAS));
-	rb_define_const(rb_mIup, "IMAGE_CANVAS", rb_str_new2(IUP_IMAGE_CANVAS));
-	rb_define_const(rb_mIup, "FULL_VISIBLE", rb_str_new2(IUP_FULL_VISIBLE));
-	rb_define_const(rb_mIup, "MOUSECLICK_CB", rb_str_new2(IUP_MOUSECLICK_CB));
-	rb_define_const(rb_mIup, "MOUSEMOTION_CB", rb_str_new2(IUP_MOUSEMOTION_CB));
-	rb_define_const(rb_mIup, "DRAW_CB", rb_str_new2(IUP_DRAW_CB));
-	rb_define_const(rb_mIup, "WIDTH_CB", rb_str_new2(IUP_WIDTH_CB));
-	rb_define_const(rb_mIup, "HEIGHT_CB", rb_str_new2(IUP_HEIGHT_CB));
-	rb_define_const(rb_mIup, "NLINES_CB", rb_str_new2(IUP_NLINES_CB));
-	rb_define_const(rb_mIup, "NCOLS_CB", rb_str_new2(IUP_NCOLS_CB));
-	rb_define_const(rb_mIup, "HSPAN_CB", rb_str_new2(IUP_HSPAN_CB));
-	rb_define_const(rb_mIup, "VSPAN_CB", rb_str_new2(IUP_VSPAN_CB));
-	rb_define_const(rb_mIup, "SCROLLING_CB", rb_str_new2(IUP_SCROLLING_CB));
 	rb_define_module_function(rb_mIup, "Cells", rb_IupCells, -1);
 
-	rb_define_const(rb_mIup, "NUM_PARTS", rb_str_new2(IUP_NUM_PARTS));
-	rb_define_const(rb_mIup, "NUM_CELLS", rb_str_new2(IUP_NUM_CELLS));
-	rb_define_const(rb_mIup, "PREVIEW_SIZE", rb_str_new2(IUP_PREVIEW_SIZE));
-	rb_define_const(rb_mIup, "SHOW_PREVIEW", rb_str_new2(IUP_SHOW_PREVIEW));
-	rb_define_const(rb_mIup, "SHOW_SECONDARY", rb_str_new2(IUP_SHOW_SECONDARY));
-	rb_define_const(rb_mIup, "PRIMARY_CELL", rb_str_new2(IUP_PRIMARY_CELL));
-	rb_define_const(rb_mIup, "SECONDARY_CELL", rb_str_new2(IUP_SECONDARY_CELL));
-	rb_define_const(rb_mIup, "ORIENTATION", INT2FIX(IUP_ORIENTATION));
-	rb_define_const(rb_mIup, "SQUARED", INT2FIX(IUP_SQUARED));
-	rb_define_const(rb_mIup, "SHADOWED", INT2FIX(IUP_SHADOWED));
-	rb_define_const(rb_mIup, "TRANSPARENCY", INT2FIX(IUP_TRANSPARENCY));
-	rb_define_const(rb_mIup, "CELL_CB", rb_str_new2(IUP_CELL_CB));
-	rb_define_const(rb_mIup, "EXTENDED_CB", rb_str_new2(IUP_EXTENDED_CB));
-	rb_define_const(rb_mIup, "SELECT_CB", rb_str_new2(IUP_SELECT_CB));
-	rb_define_const(rb_mIup, "SWITCH_CB", rb_str_new2(IUP_SWITCH_CB));
 	rb_define_const(rb_mIup, "PRIMARY", INT2FIX(IUP_PRIMARY));
 	rb_define_const(rb_mIup, "SECONDARY", INT2FIX(IUP_SECONDARY));
 	rb_define_module_function(rb_mIup, "Colorbar", rb_IupColorbar, 0);
@@ -288,213 +242,7 @@ DLLEXPORT void Init_iup()
 	rb_define_module_function(rb_mIup, "ControlsOpen", rb_IupControlsOpen, 0);
 	rb_define_module_function(rb_mIup, "ControlsClose", rb_IupControlsClose, 0);
 	rb_define_module_function(rb_mIup, "ImageLibOpen", rb_IupImageLibOpen, 0);
-	rb_define_module_function(rb_mIup, "ImageLibClose", rb_IupImageLibClose, 0);
 
-	rb_define_const(rb_mIup, "RUN", rb_str_new2(IUP_RUN));
-	rb_define_const(rb_mIup, "ENGLISH", rb_str_new2(IUP_ENGLISH));
-	rb_define_const(rb_mIup, "PORTUGUESE", rb_str_new2(IUP_PORTUGUESE));
-	rb_define_const(rb_mIup, "SBH", rb_str_new2(IUP_SBH));
-	rb_define_const(rb_mIup, "SBV", rb_str_new2(IUP_SBV));
-	rb_define_const(rb_mIup, "DEFAULT_ACTION", rb_str_new2(IUP_DEFAULT_ACTION));
-	rb_define_const(rb_mIup, "IDLE_ACTION", rb_str_new2(IUP_IDLE_ACTION));
-	rb_define_const(rb_mIup, "ACTION", rb_str_new2(IUP_ACTION));
-	rb_define_const(rb_mIup, "GETFOCUS_CB", rb_str_new2(IUP_GETFOCUS_CB));
-	rb_define_const(rb_mIup, "KILLFOCUS_CB", rb_str_new2(IUP_KILLFOCUS_CB));
-	rb_define_const(rb_mIup, "K_ANY", rb_str_new2(IUP_K_ANY));
-	rb_define_const(rb_mIup, "KEYPRESS_CB", rb_str_new2(IUP_KEYPRESS_CB));
-	rb_define_const(rb_mIup, "HELP_CB", rb_str_new2(IUP_HELP_CB));
-	rb_define_const(rb_mIup, "SCROLL_CB", rb_str_new2(IUP_SCROLL_CB));
-	rb_define_const(rb_mIup, "RESIZE_CB", rb_str_new2(IUP_RESIZE_CB));
-	rb_define_const(rb_mIup, "MOTION_CB", rb_str_new2(IUP_MOTION_CB));
-	rb_define_const(rb_mIup, "BUTTON_CB", rb_str_new2(IUP_BUTTON_CB));
-	rb_define_const(rb_mIup, "ENTERWINDOW_CB", rb_str_new2(IUP_ENTERWINDOW_CB));
-	rb_define_const(rb_mIup, "LEAVEWINDOW_CB", rb_str_new2(IUP_LEAVEWINDOW_CB));
-	rb_define_const(rb_mIup, "WHEEL_CB", rb_str_new2(IUP_WHEEL_CB));
-	rb_define_const(rb_mIup, "MASK_CB", rb_str_new2(IUP_MASK_CB));
-	rb_define_const(rb_mIup, "OPEN_CB", rb_str_new2(IUP_OPEN_CB));
-	rb_define_const(rb_mIup, "HIGHLIGHT_CB", rb_str_new2(IUP_HIGHLIGHT_CB));
-	rb_define_const(rb_mIup, "MENUCLOSE_CB", rb_str_new2(IUP_MENUCLOSE_CB));
-	rb_define_const(rb_mIup, "MAP_CB", rb_str_new2(IUP_MAP_CB));
-	rb_define_const(rb_mIup, "CLOSE_CB", rb_str_new2(IUP_CLOSE_CB));
-	rb_define_const(rb_mIup, "SHOW_CB", rb_str_new2(IUP_SHOW_CB));
-	rb_define_const(rb_mIup, "DROPFILES_CB", rb_str_new2(IUP_DROPFILES_CB));
-	rb_define_const(rb_mIup, "WOM_CB", rb_str_new2(IUP_WOM_CB));
-	rb_define_const(rb_mIup, "DIRECTION", rb_str_new2(IUP_DIRECTION));
-	rb_define_const(rb_mIup, "ACTIVE", rb_str_new2(IUP_ACTIVE));
-	rb_define_const(rb_mIup, "BGCOLOR", rb_str_new2(IUP_BGCOLOR));
-	rb_define_const(rb_mIup, "FRAMECOLOR", rb_str_new2(IUP_FRAMECOLOR));
-	rb_define_const(rb_mIup, "FGCOLOR", rb_str_new2(IUP_FGCOLOR));
-	rb_define_const(rb_mIup, "COLOR", rb_str_new2(IUP_COLOR));
-	rb_define_const(rb_mIup, "WID", rb_str_new2(IUP_WID));
-	rb_define_const(rb_mIup, "SIZE", rb_str_new2(IUP_SIZE));
-	rb_define_const(rb_mIup, "RASTERSIZE", rb_str_new2(IUP_RASTERSIZE));
-	rb_define_const(rb_mIup, "TITLE", rb_str_new2(IUP_TITLE));
-	rb_define_const(rb_mIup, "VALUE", rb_str_new2(IUP_VALUE));
-	rb_define_const(rb_mIup, "VISIBLE", rb_str_new2(IUP_VISIBLE));
-	rb_define_const(rb_mIup, "FONT", rb_str_new2(IUP_FONT));
-	rb_define_const(rb_mIup, "TIP", rb_str_new2(IUP_TIP));
-	rb_define_const(rb_mIup, "EXPAND", rb_str_new2(IUP_EXPAND));
-	rb_define_const(rb_mIup, "SEPARATOR", rb_str_new2(IUP_SEPARATOR));
-	rb_define_const(rb_mIup, "HOTSPOT", rb_str_new2(IUP_HOTSPOT));
-	rb_define_const(rb_mIup, "HEIGHT", rb_str_new2(IUP_HEIGHT));
-	rb_define_const(rb_mIup, "WIDTH", rb_str_new2(IUP_WIDTH));
-	rb_define_const(rb_mIup, "KEY", rb_str_new2(IUP_KEY));
-	rb_define_const(rb_mIup, "MULTIPLE", rb_str_new2(IUP_MULTIPLE));
-	rb_define_const(rb_mIup, "DROPDOWN", rb_str_new2(IUP_DROPDOWN));
-	rb_define_const(rb_mIup, "VISIBLE_ITEMS", rb_str_new2(IUP_VISIBLE_ITEMS));
-	rb_define_const(rb_mIup, "MARGIN", rb_str_new2(IUP_MARGIN));
-	rb_define_const(rb_mIup, "GAP", rb_str_new2(IUP_GAP));
-	rb_define_const(rb_mIup, "ALIGNMENT", rb_str_new2(IUP_ALIGNMENT));
-	rb_define_const(rb_mIup, "IMAGE", rb_str_new2(IUP_IMAGE));
-	rb_define_const(rb_mIup, "IMINACTIVE", rb_str_new2(IUP_IMINACTIVE));
-	rb_define_const(rb_mIup, "IMPRESS", rb_str_new2(IUP_IMPRESS));
-	rb_define_const(rb_mIup, "SAVEUNDER", rb_str_new2(IUP_SAVEUNDER));
-	rb_define_const(rb_mIup, "NC", rb_str_new2(IUP_NC));
-	rb_define_const(rb_mIup, "MASK", rb_str_new2(IUP_MASK));
-	rb_define_const(rb_mIup, "APPEND", rb_str_new2(IUP_APPEND));
-	rb_define_const(rb_mIup, "BORDER", rb_str_new2(IUP_BORDER));
-	rb_define_const(rb_mIup, "CARET", rb_str_new2(IUP_CARET));
-	rb_define_const(rb_mIup, "SELECTION", rb_str_new2(IUP_SELECTION));
-	rb_define_const(rb_mIup, "SELECTEDTEXT", rb_str_new2(IUP_SELECTEDTEXT));
-	rb_define_const(rb_mIup, "INSERT", rb_str_new2(IUP_INSERT));
-	rb_define_const(rb_mIup, "CONID", rb_str_new2(IUP_CONID));
-	rb_define_const(rb_mIup, "CURSOR", rb_str_new2(IUP_CURSOR));
-	rb_define_const(rb_mIup, "ICON", rb_str_new2(IUP_ICON));
-	rb_define_const(rb_mIup, "MENUBOX", rb_str_new2(IUP_MENUBOX));
-	rb_define_const(rb_mIup, "MINBOX", rb_str_new2(IUP_MINBOX));
-	rb_define_const(rb_mIup, "MAXBOX", rb_str_new2(IUP_MAXBOX));
-	rb_define_const(rb_mIup, "RESIZE", rb_str_new2(IUP_RESIZE));
-	rb_define_const(rb_mIup, "MENU", rb_str_new2(IUP_MENU));
-	rb_define_const(rb_mIup, "STARTFOCUS", rb_str_new2(IUP_STARTFOCUS));
-	rb_define_const(rb_mIup, "PARENTDIALOG", rb_str_new2(IUP_PARENTDIALOG));
-	rb_define_const(rb_mIup, "SHRINK", rb_str_new2(IUP_SHRINK));
-	rb_define_const(rb_mIup, "DEFAULTENTER", rb_str_new2(IUP_DEFAULTENTER));
-	rb_define_const(rb_mIup, "DEFAULTESC", rb_str_new2(IUP_DEFAULTESC));
-	rb_define_const(rb_mIup, "X", rb_str_new2(IUP_X));
-	rb_define_const(rb_mIup, "Y", rb_str_new2(IUP_Y));
-	rb_define_const(rb_mIup, "TOOLBOX", rb_str_new2(IUP_TOOLBOX));
-	rb_define_const(rb_mIup, "CONTROL", rb_str_new2(IUP_CONTROL));
-	rb_define_const(rb_mIup, "READONLY", rb_str_new2(IUP_READONLY));
-	rb_define_const(rb_mIup, "SCROLLBAR", rb_str_new2(IUP_SCROLLBAR));
-	rb_define_const(rb_mIup, "POSY", rb_str_new2(IUP_POSY));
-	rb_define_const(rb_mIup, "POSX", rb_str_new2(IUP_POSX));
-	rb_define_const(rb_mIup, "DX", rb_str_new2(IUP_DX));
-	rb_define_const(rb_mIup, "DY", rb_str_new2(IUP_DY));
-	rb_define_const(rb_mIup, "XMAX", rb_str_new2(IUP_XMAX));
-	rb_define_const(rb_mIup, "XMIN", rb_str_new2(IUP_XMIN));
-	rb_define_const(rb_mIup, "YMAX", rb_str_new2(IUP_YMAX));
-	rb_define_const(rb_mIup, "YMIN", rb_str_new2(IUP_YMIN));
-	rb_define_const(rb_mIup, "RED", rb_str_new2(IUP_RED));
-	rb_define_const(rb_mIup, "GREEN", rb_str_new2(IUP_GREEN));
-	rb_define_const(rb_mIup, "BLUE", rb_str_new2(IUP_BLUE));
-	rb_define_const(rb_mIup, "MIN", rb_str_new2(IUP_MIN));
-	rb_define_const(rb_mIup, "MAX", rb_str_new2(IUP_MAX));
-	rb_define_const(rb_mIup, "TIME", rb_str_new2(IUP_TIME));
-	rb_define_const(rb_mIup, "DRAG", rb_str_new2(IUP_DRAG));
-	rb_define_const(rb_mIup, "DROP", rb_str_new2(IUP_DROP));
-	rb_define_const(rb_mIup, "TOPMOST", rb_str_new2(IUP_TOPMOST));
-	rb_define_const(rb_mIup, "CLIPCHILDREN", rb_str_new2(IUP_CLIPCHILDREN));
-	rb_define_const(rb_mIup, "DIALOGTYPE", rb_str_new2(IUP_DIALOGTYPE));
-	rb_define_const(rb_mIup, "FILE", rb_str_new2(IUP_FILE));
-	rb_define_const(rb_mIup, "MULTIPLEFILES", rb_str_new2(IUP_MULTIPLEFILES));
-	rb_define_const(rb_mIup, "FILTER", rb_str_new2(IUP_FILTER));
-	rb_define_const(rb_mIup, "FILTERUSED", rb_str_new2(IUP_FILTERUSED));
-	rb_define_const(rb_mIup, "FILTERINFO", rb_str_new2(IUP_FILTERINFO));
-	rb_define_const(rb_mIup, "EXTFILTER", rb_str_new2(IUP_EXTFILTER));
-	rb_define_const(rb_mIup, "DIRECTORY", rb_str_new2(IUP_DIRECTORY));
-	rb_define_const(rb_mIup, "ALLOWNEW", rb_str_new2(IUP_ALLOWNEW));
-	rb_define_const(rb_mIup, "NOOVERWRITEPROMPT", rb_str_new2(IUP_NOOVERWRITEPROMPT));
-	rb_define_const(rb_mIup, "NOCHANGEDIR", rb_str_new2(IUP_NOCHANGEDIR));
-	rb_define_const(rb_mIup, "FILEEXIST", rb_str_new2(IUP_FILEEXIST));
-	rb_define_const(rb_mIup, "STATUS", rb_str_new2(IUP_STATUS));
-	rb_define_const(rb_mIup, "LOCKLOOP", rb_str_new2(IUP_LOCKLOOP));
-	rb_define_const(rb_mIup, "SYSTEM", rb_str_new2(IUP_SYSTEM));
-	rb_define_const(rb_mIup, "DRIVER", rb_str_new2(IUP_DRIVER));
-	rb_define_const(rb_mIup, "SCREENSIZE", rb_str_new2(IUP_SCREENSIZE));
-	rb_define_const(rb_mIup, "SYSTEMLANGUAGE", rb_str_new2(IUP_SYSTEMLANGUAGE));
-	rb_define_const(rb_mIup, "COMPUTERNAME", rb_str_new2(IUP_COMPUTERNAME));
-	rb_define_const(rb_mIup, "USERNAME", rb_str_new2(IUP_USERNAME));
-	rb_define_const(rb_mIup, "OPEN", rb_str_new2(IUP_OPEN));
-	rb_define_const(rb_mIup, "SAVE", rb_str_new2(IUP_SAVE));
-	rb_define_const(rb_mIup, "DIR", rb_str_new2(IUP_DIR));
-	rb_define_const(rb_mIup, "HORIZONTAL", rb_str_new2(IUP_HORIZONTAL));
-	rb_define_const(rb_mIup, "VERTICAL", rb_str_new2(IUP_VERTICAL));
-	rb_define_const(rb_mIup, "ON", rb_str_new2(IUP_ON));
-	rb_define_const(rb_mIup, "OFF", rb_str_new2(IUP_OFF));
-	rb_define_const(rb_mIup, "ACENTER", rb_str_new2(IUP_ACENTER));
-	rb_define_const(rb_mIup, "ALEFT", rb_str_new2(IUP_ALEFT));
-	rb_define_const(rb_mIup, "ARIGHT", rb_str_new2(IUP_ARIGHT));
-	rb_define_const(rb_mIup, "ATOP", rb_str_new2(IUP_ATOP));
-	rb_define_const(rb_mIup, "ABOTTOM", rb_str_new2(IUP_ABOTTOM));
-	rb_define_const(rb_mIup, "NORTH", rb_str_new2(IUP_NORTH));
-	rb_define_const(rb_mIup, "SOUTH", rb_str_new2(IUP_SOUTH));
-	rb_define_const(rb_mIup, "WEST", rb_str_new2(IUP_WEST));
-	rb_define_const(rb_mIup, "EAST", rb_str_new2(IUP_EAST));
-	rb_define_const(rb_mIup, "NE", rb_str_new2(IUP_NE));
-	rb_define_const(rb_mIup, "SE", rb_str_new2(IUP_SE));
-	rb_define_const(rb_mIup, "NW", rb_str_new2(IUP_NW));
-	rb_define_const(rb_mIup, "SW", rb_str_new2(IUP_SW));
-	rb_define_const(rb_mIup, "FULLSCREEN", rb_str_new2(IUP_FULLSCREEN));
-	rb_define_const(rb_mIup, "FULL", rb_str_new2(IUP_FULL));
-	rb_define_const(rb_mIup, "HALF", rb_str_new2(IUP_HALF));
-	rb_define_const(rb_mIup, "THIRD", rb_str_new2(IUP_THIRD));
-	rb_define_const(rb_mIup, "QUARTER", rb_str_new2(IUP_QUARTER));
-	rb_define_const(rb_mIup, "EIGHTH", rb_str_new2(IUP_EIGHTH));
-	rb_define_const(rb_mIup, "ARROW", rb_str_new2(IUP_ARROW));
-	rb_define_const(rb_mIup, "BUSY", rb_str_new2(IUP_BUSY));
-	rb_define_const(rb_mIup, "RESIZE_N", rb_str_new2(IUP_RESIZE_N));
-	rb_define_const(rb_mIup, "RESIZE_S", rb_str_new2(IUP_RESIZE_S));
-	rb_define_const(rb_mIup, "RESIZE_E", rb_str_new2(IUP_RESIZE_E));
-	rb_define_const(rb_mIup, "RESIZE_W", rb_str_new2(IUP_RESIZE_W));
-	rb_define_const(rb_mIup, "RESIZE_NE", rb_str_new2(IUP_RESIZE_NE));
-	rb_define_const(rb_mIup, "RESIZE_NW", rb_str_new2(IUP_RESIZE_NW));
-	rb_define_const(rb_mIup, "RESIZE_SE", rb_str_new2(IUP_RESIZE_SE));
-	rb_define_const(rb_mIup, "RESIZE_SW", rb_str_new2(IUP_RESIZE_SW));
-	rb_define_const(rb_mIup, "MOVE", rb_str_new2(IUP_MOVE));
-	rb_define_const(rb_mIup, "HAND", rb_str_new2(IUP_HAND));
-	rb_define_const(rb_mIup, "NONE", rb_str_new2(IUP_NONE));
-	rb_define_const(rb_mIup, "IUP", rb_str_new2(IUP_IUP));
-	rb_define_const(rb_mIup, "CROSS", rb_str_new2(IUP_CROSS));
-	rb_define_const(rb_mIup, "PEN", rb_str_new2(IUP_PEN));
-	rb_define_const(rb_mIup, "TEXT", rb_str_new2(IUP_TEXT));
-	rb_define_const(rb_mIup, "RESIZE_C", rb_str_new2(IUP_RESIZE_C));
-	rb_define_const(rb_mIup, "OPENHAND", rb_str_new2(IUP_OPENHAND));
-	rb_define_const(rb_mIup, "HELVETICA_NORMAL_8", rb_str_new2(IUP_HELVETICA_NORMAL_8));
-	rb_define_const(rb_mIup, "HELVETICA_ITALIC_8", rb_str_new2(IUP_HELVETICA_ITALIC_8));
-	rb_define_const(rb_mIup, "HELVETICA_BOLD_8", rb_str_new2(IUP_HELVETICA_BOLD_8));
-	rb_define_const(rb_mIup, "HELVETICA_NORMAL_10", rb_str_new2(IUP_HELVETICA_NORMAL_10));
-	rb_define_const(rb_mIup, "HELVETICA_ITALIC_10", rb_str_new2(IUP_HELVETICA_ITALIC_10));
-	rb_define_const(rb_mIup, "HELVETICA_BOLD_10", rb_str_new2(IUP_HELVETICA_BOLD_10));
-	rb_define_const(rb_mIup, "HELVETICA_NORMAL_12", rb_str_new2(IUP_HELVETICA_NORMAL_12));
-	rb_define_const(rb_mIup, "HELVETICA_ITALIC_12", rb_str_new2(IUP_HELVETICA_ITALIC_12));
-	rb_define_const(rb_mIup, "HELVETICA_BOLD_12", rb_str_new2(IUP_HELVETICA_BOLD_12));
-	rb_define_const(rb_mIup, "HELVETICA_NORMAL_14", rb_str_new2(IUP_HELVETICA_NORMAL_14));
-	rb_define_const(rb_mIup, "HELVETICA_ITALIC_14", rb_str_new2(IUP_HELVETICA_ITALIC_14));
-	rb_define_const(rb_mIup, "HELVETICA_BOLD_14", rb_str_new2(IUP_HELVETICA_BOLD_14));
-	rb_define_const(rb_mIup, "COURIER_NORMAL_8", rb_str_new2(IUP_COURIER_NORMAL_8));
-	rb_define_const(rb_mIup, "COURIER_ITALIC_8", rb_str_new2(IUP_COURIER_ITALIC_8));
-	rb_define_const(rb_mIup, "COURIER_BOLD_8", rb_str_new2(IUP_COURIER_BOLD_8));
-	rb_define_const(rb_mIup, "COURIER_NORMAL_10", rb_str_new2(IUP_COURIER_NORMAL_10));
-	rb_define_const(rb_mIup, "COURIER_ITALIC_10", rb_str_new2(IUP_COURIER_ITALIC_10));
-	rb_define_const(rb_mIup, "COURIER_BOLD_10", rb_str_new2(IUP_COURIER_BOLD_10));
-	rb_define_const(rb_mIup, "COURIER_NORMAL_12", rb_str_new2(IUP_COURIER_NORMAL_12));
-	rb_define_const(rb_mIup, "COURIER_ITALIC_12", rb_str_new2(IUP_COURIER_ITALIC_12));
-	rb_define_const(rb_mIup, "COURIER_BOLD_12", rb_str_new2(IUP_COURIER_BOLD_12));
-	rb_define_const(rb_mIup, "COURIER_NORMAL_14", rb_str_new2(IUP_COURIER_NORMAL_14));
-	rb_define_const(rb_mIup, "COURIER_ITALIC_14", rb_str_new2(IUP_COURIER_ITALIC_14));
-	rb_define_const(rb_mIup, "COURIER_BOLD_14", rb_str_new2(IUP_COURIER_BOLD_14));
-	rb_define_const(rb_mIup, "TIMES_NORMAL_8", rb_str_new2(IUP_TIMES_NORMAL_8));
-	rb_define_const(rb_mIup, "TIMES_ITALIC_8", rb_str_new2(IUP_TIMES_ITALIC_8));
-	rb_define_const(rb_mIup, "TIMES_BOLD_8", rb_str_new2(IUP_TIMES_BOLD_8));
-	rb_define_const(rb_mIup, "TIMES_NORMAL_10", rb_str_new2(IUP_TIMES_NORMAL_10));
-	rb_define_const(rb_mIup, "TIMES_ITALIC_10", rb_str_new2(IUP_TIMES_ITALIC_10));
-	rb_define_const(rb_mIup, "TIMES_BOLD_10", rb_str_new2(IUP_TIMES_BOLD_10));
-	rb_define_const(rb_mIup, "TIMES_NORMAL_12", rb_str_new2(IUP_TIMES_NORMAL_12));
-	rb_define_const(rb_mIup, "TIMES_ITALIC_12", rb_str_new2(IUP_TIMES_ITALIC_12));
-	rb_define_const(rb_mIup, "TIMES_BOLD_12", rb_str_new2(IUP_TIMES_BOLD_12));
-	rb_define_const(rb_mIup, "TIMES_NORMAL_14", rb_str_new2(IUP_TIMES_NORMAL_14));
-	rb_define_const(rb_mIup, "TIMES_ITALIC_14", rb_str_new2(IUP_TIMES_ITALIC_14));
-	rb_define_const(rb_mIup, "TIMES_BOLD_14", rb_str_new2(IUP_TIMES_BOLD_14));
 
 	rb_define_const(rb_mIup, "ICTL_MOUSEMOVE_CB", rb_str_new2(ICTL_MOUSEMOVE_CB));
 	rb_define_const(rb_mIup, "ICTL_BUTTON_PRESS_CB", rb_str_new2(ICTL_BUTTON_PRESS_CB));
@@ -516,25 +264,6 @@ DLLEXPORT void Init_iup()
 
 	rb_define_module_function(rb_mIup, "GetParam", rb_IupGetParam, -1);
 
-	rb_define_const(rb_mIup, "BUFFER", rb_str_new2(IUP_BUFFER));
-	rb_define_const(rb_mIup, "STEREO", rb_str_new2(IUP_STEREO));
-	rb_define_const(rb_mIup, "BUFFER_SIZE", rb_str_new2(IUP_BUFFER_SIZE));
-	rb_define_const(rb_mIup, "RED_SIZE", rb_str_new2(IUP_RED_SIZE));
-	rb_define_const(rb_mIup, "GREEN_SIZE", rb_str_new2(IUP_GREEN_SIZE));
-	rb_define_const(rb_mIup, "BLUE_SIZE", rb_str_new2(IUP_BLUE_SIZE));
-	rb_define_const(rb_mIup, "ALPHA_SIZE", rb_str_new2(IUP_ALPHA_SIZE));
-	rb_define_const(rb_mIup, "DEPTH_SIZE", rb_str_new2(IUP_DEPTH_SIZE));
-	rb_define_const(rb_mIup, "STENCIL_SIZE", rb_str_new2(IUP_STENCIL_SIZE));
-	rb_define_const(rb_mIup, "ACCUM_RED_SIZE", rb_str_new2(IUP_ACCUM_RED_SIZE));
-	rb_define_const(rb_mIup, "ACCUM_GREEN_SIZE", rb_str_new2(IUP_ACCUM_GREEN_SIZE));
-	rb_define_const(rb_mIup, "ACCUM_BLUE_SIZE", rb_str_new2(IUP_ACCUM_BLUE_SIZE));
-	rb_define_const(rb_mIup, "ACCUM_ALPHA_SIZE", rb_str_new2(IUP_ACCUM_ALPHA_SIZE));
-	rb_define_const(rb_mIup, "DOUBLE", rb_str_new2(IUP_DOUBLE));
-	rb_define_const(rb_mIup, "SINGLE", rb_str_new2(IUP_SINGLE));
-	rb_define_const(rb_mIup, "INDEX", rb_str_new2(IUP_INDEX));
-	rb_define_const(rb_mIup, "RGBA", rb_str_new2(IUP_RGBA));
-	rb_define_const(rb_mIup, "YES", rb_str_new2(IUP_YES));
-	rb_define_const(rb_mIup, "NO", rb_str_new2(IUP_NO));
 	rb_define_module_function(rb_mIup, "GLCanvasOpen", rb_IupGLCanvasOpen, 0);
 	rb_define_module_function(rb_mIup, "GLCanvas", rb_IupGLCanvas, -1);
 	rb_define_module_function(rb_mIup, "GLMakeCurrent", rb_IupGLMakeCurrent, 1);
@@ -818,39 +547,6 @@ DLLEXPORT void Init_iup()
 	rb_define_method(rb_cIupMatrix, "MatGetAttribute", rb_IupMatGetAttribute, 3);
 	rb_define_method(rb_cIupMatrix, "MatGetInt", rb_IupMatGetInt, 3);
 	rb_define_method(rb_cIupMatrix, "MatGetFloat", rb_IupMatGetFloat, 3);
-	rb_define_const(rb_mIup, "ENTERITEM_CB", rb_str_new2(IUP_ENTERITEM_CB));
-	rb_define_const(rb_mIup, "LEAVEITEM_CB", rb_str_new2(IUP_LEAVEITEM_CB));
-	rb_define_const(rb_mIup, "EDITION_CB", rb_str_new2(IUP_EDITION_CB));
-	rb_define_const(rb_mIup, "CLICK_CB", rb_str_new2(IUP_CLICK_CB));
-	rb_define_const(rb_mIup, "DROP_CB", rb_str_new2(IUP_DROP_CB));
-	rb_define_const(rb_mIup, "DROPSELECT_CB", rb_str_new2(IUP_DROPSELECT_CB));
-	rb_define_const(rb_mIup, "DROPCHECK_CB", rb_str_new2(IUP_DROPCHECK_CB));
-	rb_define_const(rb_mIup, "VALUE_CB", rb_str_new2(IUP_VALUE_CB));
-	rb_define_const(rb_mIup, "VALUE_EDIT_CB", rb_str_new2(IUP_VALUE_EDIT_CB));
-	rb_define_const(rb_mIup, "FIELD_CB", rb_str_new2(IUP_FIELD_CB));
-	rb_define_const(rb_mIup, "RESIZEMATRIX", rb_str_new2(IUP_RESIZEMATRIX));
-	rb_define_const(rb_mIup, "ADDLIN", rb_str_new2(IUP_ADDLIN));
-	rb_define_const(rb_mIup, "ADDCOL", rb_str_new2(IUP_ADDCOL));
-	rb_define_const(rb_mIup, "DELLIN", rb_str_new2(IUP_DELLIN));
-	rb_define_const(rb_mIup, "DELCOL", rb_str_new2(IUP_DELCOL));
-	rb_define_const(rb_mIup, "NUMLIN", rb_str_new2(IUP_NUMLIN));
-	rb_define_const(rb_mIup, "NUMCOL", rb_str_new2(IUP_NUMCOL));
-	rb_define_const(rb_mIup, "NUMLIN_VISIBLE", rb_str_new2(IUP_NUMLIN_VISIBLE));
-	rb_define_const(rb_mIup, "NUMCOL_VISIBLE", rb_str_new2(IUP_NUMCOL_VISIBLE));
-	rb_define_const(rb_mIup, "MARKED", rb_str_new2(IUP_MARKED));
-	rb_define_const(rb_mIup, "WIDTHDEF", rb_str_new2(IUP_WIDTHDEF));
-	rb_define_const(rb_mIup, "HEIGHTDEF", rb_str_new2(IUP_HEIGHTDEF));
-	rb_define_const(rb_mIup, "AREA", rb_str_new2(IUP_AREA));
-	rb_define_const(rb_mIup, "MARK_MODE", rb_str_new2(IUP_MARK_MODE));
-	rb_define_const(rb_mIup, "LIN", rb_str_new2(IUP_LIN));
-	rb_define_const(rb_mIup, "COL", rb_str_new2(IUP_COL));
-	rb_define_const(rb_mIup, "LINCOL", rb_str_new2(IUP_LINCOL));
-	rb_define_const(rb_mIup, "CELL", rb_str_new2(IUP_CELL));
-	rb_define_const(rb_mIup, "EDIT_MODE", rb_str_new2(IUP_EDIT_MODE));
-	rb_define_const(rb_mIup, "FOCUS_CELL", rb_str_new2(IUP_FOCUS_CELL));
-	rb_define_const(rb_mIup, "REDRAW", rb_str_new2(IUP_REDRAW));
-	rb_define_const(rb_mIup, "PREVIOUSVALUE", rb_str_new2(IUP_PREVIOUSVALUE));
-	rb_define_const(rb_mIup, "MOUSEMOVE_CB", rb_str_new2(IUP_MOUSEMOVE_CB));
 
 	//rb_define_module_function(rb_mIup, "OleControl", rb_IupOleControl, 1);
 	//rb_define_module_function(rb_mIup, "OleControlOpen", rb_IupOleControlOpen, 0);
@@ -887,49 +583,6 @@ DLLEXPORT void Init_iup()
 	rb_define_method(rb_mIup, "TreeGetAttribute", rb_IupTreeGetAttribute, 2);
 	rb_define_method(rb_mIup, "TreeGetInt", rb_IupTreeGetInt, 2);
 	rb_define_method(rb_mIup, "TreeGetFloat", rb_IupTreeGetFloat, 2);
-	rb_define_const(rb_mIup, "ADDLEAF", rb_str_new2(IUP_ADDLEAF));
-	rb_define_const(rb_mIup, "ADDBRANCH", rb_str_new2(IUP_ADDBRANCH));
-	rb_define_const(rb_mIup, "DELNODE", rb_str_new2(IUP_DELNODE));
-	rb_define_const(rb_mIup, "IMAGELEAF", rb_str_new2(IUP_IMAGELEAF));
-	rb_define_const(rb_mIup, "IMAGEBRANCHCOLLAPSED", rb_str_new2(IUP_IMAGEBRANCHCOLLAPSED));
-	rb_define_const(rb_mIup, "IMAGEBRANCHEXPANDED", rb_str_new2(IUP_IMAGEBRANCHEXPANDED));
-	rb_define_const(rb_mIup, "IMAGEEXPANDED", rb_str_new2(IUP_IMAGEEXPANDED));
-	rb_define_const(rb_mIup, "KIND", rb_str_new2(IUP_KIND));
-	rb_define_const(rb_mIup, "PARENT", rb_str_new2(IUP_PARENT));
-	rb_define_const(rb_mIup, "DEPTH", rb_str_new2(IUP_DEPTH));
-	rb_define_const(rb_mIup, "ADDEXPANDED", rb_str_new2(IUP_ADDEXPANDED));
-	rb_define_const(rb_mIup, "CTRL", rb_str_new2(IUP_CTRL));
-	rb_define_const(rb_mIup, "SHIFT", rb_str_new2(IUP_SHIFT));
-	rb_define_const(rb_mIup, "STATE", rb_str_new2(IUP_STATE));
-	rb_define_const(rb_mIup, "STARTING", rb_str_new2(IUP_STARTING));
-	rb_define_const(rb_mIup, "LEAF", rb_str_new2(IUP_LEAF));
-	rb_define_const(rb_mIup, "BRANCH", rb_str_new2(IUP_BRANCH));
-	rb_define_const(rb_mIup, "SELECTED", rb_str_new2(IUP_SELECTED));
-	rb_define_const(rb_mIup, "CHILDREN", rb_str_new2(IUP_CHILDREN));
-	rb_define_const(rb_mIup, "ROOT", rb_str_new2(IUP_ROOT));
-	rb_define_const(rb_mIup, "LAST", rb_str_new2(IUP_LAST));
-	rb_define_const(rb_mIup, "PGUP", rb_str_new2(IUP_PGUP));
-	rb_define_const(rb_mIup, "PGDN", rb_str_new2(IUP_PGDN));
-	rb_define_const(rb_mIup, "NEXT", rb_str_new2(IUP_NEXT));
-	rb_define_const(rb_mIup, "PREVIOUS", rb_str_new2(IUP_PREVIOUS));
-	rb_define_const(rb_mIup, "INVERT", rb_str_new2(IUP_INVERT));
-	rb_define_const(rb_mIup, "BLOCK", rb_str_new2(IUP_BLOCK));
-	rb_define_const(rb_mIup, "CLEARALL", rb_str_new2(IUP_CLEARALL));
-	rb_define_const(rb_mIup, "MARKALL", rb_str_new2(IUP_MARKALL));
-	rb_define_const(rb_mIup, "INVERTALL", rb_str_new2(IUP_INVERTALL));
-	rb_define_const(rb_mIup, "COLLAPSED", rb_str_new2(IUP_COLLAPSED));
-	rb_define_const(rb_mIup, "EXPANDED", rb_str_new2(IUP_EXPANDED));
-	rb_define_const(rb_mIup, "SELECTION_CB", rb_str_new2(IUP_SELECTION_CB));
-	rb_define_const(rb_mIup, "BRANCHOPEN_CB", rb_str_new2(IUP_BRANCHOPEN_CB));
-	rb_define_const(rb_mIup, "BRANCHCLOSE_CB", rb_str_new2(IUP_BRANCHCLOSE_CB));
-	rb_define_const(rb_mIup, "RIGHTCLICK_CB", rb_str_new2(IUP_RIGHTCLICK_CB));
-	rb_define_const(rb_mIup, "EXECUTELEAF_CB", rb_str_new2(IUP_EXECUTELEAF_CB));
-	rb_define_const(rb_mIup, "RENAMENODE_CB", rb_str_new2(IUP_RENAMENODE_CB));
-	rb_define_const(rb_mIup, "IMGLEAF", INT2FIX(IUP_IMGLEAF));
-	rb_define_const(rb_mIup, "IMGCOLLAPSED", INT2FIX(IUP_IMGCOLLAPSED));
-	rb_define_const(rb_mIup, "IMGEXPANDED", INT2FIX(IUP_IMGEXPANDED));
-	rb_define_const(rb_mIup, "IMGBLANK", INT2FIX(IUP_IMGBLANK));
-	rb_define_const(rb_mIup, "IMGPAPER", INT2FIX(IUP_IMGPAPER));
 
 	rb_define_const(rb_mIup, "ICTL_SHOWTICKS", rb_str_new2(ICTL_SHOWTICKS));
 	rb_define_module_function(rb_mIup, "Val", rb_IupVal, -1);
@@ -1254,7 +907,6 @@ DLLEXPORT void Init_iup()
 	rb_define_module_function(rb_mCd, "ContextPDF", rb_cdContextPDF, 0);
 	
 	rb_IupOpen(rb_mIup);
-	IupControlsOpen();
 	IupSetLanguage(IUP_ENGLISH);
 
 	atexit(exit_handler);

data/ext/rb_iup.h

@@ -1,6 +1,7 @@
 #include <ruby.h>
 #include "iup.h"
 #include "iupcontrols.h"
+#include "cd.h"
 
 extern VALUE rb_eIupError;
 static char IdleAction[100];
@@ -32,6 +33,7 @@ VALUE rb_cIupMultiLine;
 VALUE rb_cIupUser;
 VALUE rb_cIupControl;
 VALUE rb_cIupTimer;
+VALUE rb_cIupProgressBar;
 VALUE rb_cIupFileDlg;
 VALUE rb_cIupTree;
 VALUE rb_cIupNode;
@@ -81,7 +83,7 @@ VALUE rb_method_missing(int argc,VALUE *argv, VALUE self)
 	if(!*mname) {
         	rb_raise(rb_eRuntimeError, "fail: unknown method or property");
     	} 	
-	n = strlen(mname);
+		n = strlen(mname);
     	if(mname[n-1] == '=') 
     		mname[n-1] = 0;
     	if(argc==2) {
@@ -931,7 +933,7 @@ static int _idle_cb()
 	return IUP_DEFAULT;
 }
 
-static int _postdraw_cb(Ihandle* ih, void* cnv)
+static int _postdraw_cb(Ihandle* ih,void *cnv)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_POSTDRAW_CB");
 	VALUE v;
@@ -939,16 +941,16 @@ static int _postdraw_cb(Ihandle* ih, void* cnv)
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_POSTDRAW_CB");
-			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
-			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
 	return IUP_DEFAULT;
 }
 
-static int _predraw_cb(Ihandle* ih, void* cnv)
+static int _predraw_cb(Ihandle* ih,void *cnv)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_PREDRAW_CB");
 	VALUE v;
@@ -956,9 +958,9 @@ static int _predraw_cb(Ihandle* ih, void* cnv)
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_PREDRAW_CB");
-			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(proc,rb_intern("call"),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
-			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			v = rb_funcall(rb_cObject,rb_intern(func),2,node,rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1078,10 +1080,10 @@ static int _draw_cb(Ihandle* ih, void* cnv)
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_DRAW_CB");
 			v = rb_funcall(proc,rb_intern("call"),2,node,
-				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
 			v = rb_funcall(rb_cObject,rb_intern(func),2,node,
-				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+				rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1335,20 +1337,21 @@ static int _motion_cb(Ihandle* ih,int x, int y, char* status)
 	return IUP_DEFAULT;
 }
 
-static int _cell_draw_cb(Ihandle* ih,int line, int column, int xmin, int xmax, int ymin, int ymax, void* cnv)
+static int _cell_draw_cb(Ihandle* ih,int line, int column, int xmin, int xmax, int ymin, int ymax)
 {
 	char* func = (char*)IupGetAttribute(ih,"RB_DRAW_CB");
 	VALUE v;
+	void *cnv = (void*)cdActiveCanvas();
 	if(func) {
 		VALUE node = (VALUE)IupGetAttribute(ih,"RB_CLASS");
 		if(strcmp(func,"Proc")==0) {
 			VALUE proc = (VALUE)IupGetAttribute(ih,"RB_PROC_DRAW_CB");
 			v = rb_funcall(proc,rb_intern("call"),8,node,
 			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),
-			rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		} else {
 			v = rb_funcall(rb_cObject,rb_intern(func),8,node,
-			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),rb_funcall(rb_cCdCanvas,rb_intern("new"),1,INT2FIX(cnv)));
+			INT2FIX(line),INT2FIX(column),INT2FIX(xmin),INT2FIX(xmax),INT2FIX(ymin),INT2FIX(ymax),rb_funcall(rb_cCdCanvas,rb_intern("new"),1,UINT2NUM((unsigned)cnv)));
 		}
 		return NUM2INT(v);
 	}
@@ -1535,12 +1538,12 @@ static int _rightclick_cb(Ihandle* ih, int id)
 
 static int _k_any_cb(Ihandle* ih, int c)
 {
-	extern char *iupKeyEncode(int c);
+	extern char *iupKeyCodeToName(int c);
 	char* func = NULL;
 	VALUE v;
 	static char key[100];
 	static char pkey[100];
-	sprintf(key,"RB_%s",(char*)iupKeyEncode(c));
+	sprintf(key,"RB_%s",(char*)iupKeyCodeToName(c));
 	func = (char*)IupGetAttribute(ih,key);
 	if(func==NULL) {
 		func = (char*)IupGetAttribute(ih,"RB_K_ANY");
@@ -1806,7 +1809,7 @@ VALUE rb_IupSetCallback(VALUE node,VALUE v_name,VALUE v_func)
 		v = (Icallback)_button_release_cb;
 	else if(strcmp(name,"MOUSEMOVE_CB")==0)
 		v = (Icallback)_mousemove_cb;
-	else if(strcmp(name,"SCROLL_CB")==0)
+	else if(strcmp(name,"SCROLL_CB")==0) 
 		v = (Icallback)_scroll_cb;
 	else if(strcmp(name,"RESIZE_CB")==0)
 		v = (Icallback)_resize_cb;
@@ -2444,3 +2447,33 @@ VALUE rb_IupTimer(VALUE self)
 	return Qnil;
 }
 
+VALUE rb_IupProgressBar(VALUE self)
+{
+	Ihandle* v;
+	v = IupProgressBar();
+	if(v)
+		return rb_funcall(rb_cIupProgressBar,rb_intern("new"),1,UINT2NUM((unsigned)v));
+	return Qnil;
+}
+
+VALUE rb_IupCboxv(int argc,VALUE *argv,VALUE self)
+{
+	extern VALUE rb_cIupCbox;
+	Ihandle* v;
+	int i;
+	Ihandle *params[100];
+	VALUE v_params,v_hash;
+	VALUE node;
+	rb_scan_args(argc,argv,"11",&v_params,&v_hash);
+	for(i=0;i<RARRAY(v_params)->len;i++) {
+		node = RARRAY(v_params)->ptr[i];
+		params[i] = (Ihandle*)NUM2UINT(rb_iv_get(node,"@ihandle"));
+	}
+	params[i] = NULL;
+	v = IupCboxv(params);
+	if(TYPE(v_hash)==T_HASH) 
+		rb_set_attribute(v,v_hash);	
+	if(v)
+		return rb_funcall(rb_cIupCbox,rb_intern("new"),1,UINT2NUM((unsigned)v));
+	return Qnil;
+}

data/ext/rb_iupcb.h

@@ -6,6 +6,7 @@ VALUE rb_IupColorBrowser(VALUE self)
 {
 	extern VALUE rb_cIupColorBrowser;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupColorBrowser();
 	if(v)
 		return rb_funcall(rb_cIupColorBrowser,rb_intern("new"),1,UINT2NUM((unsigned)v));

data/ext/rb_iupcells.h

@@ -6,6 +6,7 @@ VALUE rb_IupCells(int argc,VALUE *argv, VALUE self)
 {
 	extern VALUE rb_cIupCells;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupCells();
         if(argc==1 && TYPE(argv[0])==T_HASH)
                 rb_set_attribute(v,argv[0]);

data/ext/rb_iupcolorbar.h

@@ -4,13 +4,10 @@
 
 VALUE rb_IupColorbar(VALUE self)
 {
-	extern char* iupGetEnv(Ihandle* n,const char* a);
-	unsigned *obj;
 	extern VALUE rb_cIupColorbar;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupColorbar();
-	obj = (unsigned*)iupGetEnv(v,"_IUPCOLORBAR_DATA");
-	obj[4] = 0; /* initialize cddbuffer to NULL */
 	if(v)
 		return rb_funcall(rb_cIupColorbar,rb_intern("new"),1,UINT2NUM((unsigned)v));
 	return Qnil;

data/ext/rb_iupcontrols.h

@@ -21,8 +21,3 @@ VALUE rb_IupImageLibOpen(VALUE self)
 	return Qnil;
 }
 
-VALUE rb_IupImageLibClose(VALUE self)
-{
-	IupImageLibClose();
-	return Qnil;
-}

data/ext/rb_iupdial.h

@@ -15,6 +15,7 @@ VALUE rb_IupDial(int argc,VALUE *argv,VALUE self)
 	}
 	if(v_type!=Qnil)
 		type = RSTRING(v_type)->ptr;
+	IupControlsOpen();
 	v = IupDial(type);
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);	

data/ext/rb_iupgauge.h

@@ -6,6 +6,7 @@ VALUE rb_IupGauge(int argc,VALUE *argv,VALUE self)
 {
 	extern VALUE rb_cIupGauge;
 	Ihandle* v;
+	IupControlsOpen();
 	v = IupGauge();
 	if(argc==1 && TYPE(argv[0])==T_HASH)
 		rb_set_attribute(v,argv[0]);