fxruby 1.6.20-x86-mingw32 → 1.6.22.pre2-x86-mingw32

data/ext/fox16/include/FXRbApp.h

@@ -41,7 +41,7 @@ inline void cls ## _create(cls *self){ \
 static void cls ## _init(cls* self,VALUE ary,bool connect){ \
   int i; \
   char **argv; \
-  int argc=1+RARRAY_LEN(ary); \
+  int argc=static_cast<int>(1+RARRAY_LEN(ary)); \
   if(FXMALLOC(&argv,char*,argc+1)){ \
     argv[0]=const_cast<char *>("foo"); \
     for(i=1;i<argc;i++){ \
@@ -98,7 +98,7 @@ inline void cls ## _exit(cls *self,FXint code){ \
       rb_ary_push(ary,rb_str_new2(argv[i])); \
       } \
     FXRbCallVoidMethod(this,rb_intern("init"),ary,connect); \
-    argc=RARRAY_LEN(ary)+1; \
+    argc=static_cast<int>(RARRAY_LEN(ary)+1); \
     for(i=1; i<argc; i++){ \
       VALUE e=rb_ary_entry(ary,i-1); \
       argv[i]=StringValuePtr(e); \

data/ext/fox16/include/FXRbCommon.h

@@ -24,7 +24,9 @@
  * $Id: FXRbCommon.h 2303 2005-12-09 03:17:28Z lyle $
  ***********************************************************************/
 
+extern "C" {
 #include "ruby.h"
+}
 
 /**
  * The Ruby header files for Win32 redefine the symbol "select", which

data/ext/fox16/list_wrap.cpp

@@ -1185,7 +1185,7 @@ static VALUE _wrap_FXList_fillItems(int argc, VALUE *argv, VALUE self) { FXList
     FXchar **arg2 = (FXchar **) 0 ; FXIcon *arg3 = (FXIcon *) 0 ; void *arg4 = (void *) 0 ; FXbool arg5 = (FXbool) 0 ;
     FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXList, 1);
-    { arg2 = NULL; if(!NIL_P(argv[0])){ Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+    { arg2 = NULL; if(!NIL_P(argv[0])){ Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {
@@ -1864,11 +1864,11 @@ static VALUE _wrap_FXColorList_fillItems(int argc, VALUE *argv, VALUE self) { FX
     FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 4))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXColorList, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) { {
             arg3 = NULL; if(!NIL_P(argv[1])){ Check_Type(argv[1], T_ARRAY);
-                if (FXMALLOC(&arg3, FXColor, RARRAY_LEN(argv[1]))+1) { for (long i = 0; i < RARRAY_LEN(argv[1]); i++) {
+                if (FXMALLOC(&arg3, FXColor, RARRAY_LEN(argv[1])+1)) { for (long i = 0; i < RARRAY_LEN(argv[1]); i++) {
                         arg3[i] = static_cast<FXColor>(NUM2ULONG(rb_ary_entry(argv[1], i))); }  arg3[RARRAY_LEN(argv[1])] = 0; }
                  }  }  }  if (argc > 2) { arg4 = (argv[2] == Qnil) ? NULL : (void *) argv[2]; }  if (argc > 3) {
         arg5 = to_FXbool(argv[3]); }  result = (FXint)(arg1)->fillItems((FXchar const **)arg2,arg3,arg4,arg5);

data/ext/fox16/markfuncs.cpp

@@ -42,6 +42,7 @@ static void delete_if_not_owned_by_app(BASECLASS* self,SUBCLASS*){
 
 // FIXME: How to get to the target objects stored in the accelerator
 // table? This is currently private (not protected) data for the class.
+// See workaround in lib/fox16/accel_table.rb.
 void FXRbAccelTable::markfunc(FXAccelTable* accelTable){
   FXRbObject::markfunc(accelTable);
   }

data/ext/fox16/treelist_wrap.cpp

@@ -1446,7 +1446,7 @@ static VALUE _wrap_FXFoldingList_fillItems(int argc, VALUE *argv, VALUE self) {
     if ((argc < 2) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXFoldingList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXFoldingItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
-            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
                     arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {
@@ -2653,7 +2653,7 @@ static VALUE _wrap_FXTreeList_fillItems(int argc, VALUE *argv, VALUE self) { FXT
     if ((argc < 2) || (argc > 6)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeList, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
-            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
                     arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {

data/ext/fox16/ui_wrap.cpp

@@ -4976,7 +4976,7 @@ static VALUE _wrap_FXComboBox_fillItems(int argc, VALUE *argv, VALUE self) { FXC
     FXchar **arg2 = (FXchar **) 0 ; FXint result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXComboBox, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  } 
     result = (FXint)(arg1)->fillItems((FXchar const **)arg2); vresult = INT2NUM(result); FXFREE(&arg2); return vresult; }
@@ -5441,7 +5441,7 @@ static VALUE _wrap_FXListBox_fillItems(int argc, VALUE *argv, VALUE self) { FXLi
     FXchar **arg2 = (FXchar **) 0 ; FXIcon *arg3 = (FXIcon *) 0 ; void *arg4 = (void *) 0 ; FXint result; VALUE vresult = Qnil;
     if ((argc < 1) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXListBox, 1); { arg2 = NULL; if(!NIL_P(argv[0])){
-            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0]))+1) {
+            Check_Type(argv[0], T_ARRAY); if (FXMALLOC(&arg2, FXchar *, RARRAY_LEN(argv[0])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[0]); i++) { VALUE e = rb_ary_entry(argv[0], i);
                     arg2[i] = (FXchar *) StringValuePtr(e); }  arg2[RARRAY_LEN(argv[0])] = 0; }  }  }  if (argc > 1) {
         SWIG_ConvertPtr(argv[1], (void **) &arg3, SWIGTYPE_p_FXIcon, 1); }  if (argc > 2) {
@@ -5900,7 +5900,7 @@ static VALUE _wrap_FXTreeListBox_fillItems(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXTreeListBox, 1);
     SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_FXTreeItem, 1); { arg3 = NULL; if(!NIL_P(argv[1])){
-            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1]))+1) {
+            Check_Type(argv[1], T_ARRAY); if (FXMALLOC(&arg3, FXchar *, RARRAY_LEN(argv[1])+1)) {
                 for (long i = 0; i < RARRAY_LEN(argv[1]); i++) { VALUE e = rb_ary_entry(argv[1], i);
                     arg3[i] = (FXchar *) StringValuePtr(e); }  arg3[RARRAY_LEN(argv[1])] = 0; }  }  }  if (argc > 2) {
         SWIG_ConvertPtr(argv[2], (void **) &arg4, SWIGTYPE_p_FXIcon, 1); }  if (argc > 3) {

data/lib/fox16/accel_table.rb

@@ -1,7 +1,7 @@
 module Fox
   class FXAccelTable
     alias addAccelOrig addAccel # :nodoc:
-    
+
     #
     # Add an accelerator to the table. The _hotKey_ is a code returned
     # by the Fox.fxparseAccel method.
@@ -48,7 +48,7 @@ module Fox
       if args.length > 0
         if args[0].respond_to? :call
           tgt = FXPseudoTarget.new
-          seldn = FXSEL(SEL_KEYPRESS, 0)
+          seldn = Fox.FXSEL(SEL_KEYPRESS, 0)
           tgt.pconnect(SEL_KEYPRESS, args[0])
         else
           tgt = args[0]
@@ -56,7 +56,7 @@ module Fox
         if args.length > 1
           if args[1].respond_to? :call
             tgt = tgt || FXPseudoTarget.new
-            selup = FXSEL(SEL_KEYRELEASE, 0)
+            selup = Fox.FXSEL(SEL_KEYRELEASE, 0)
             tgt.pconnect(SEL_KEYRELEASE, args[1])
           else
             seldn = args[1]
@@ -64,7 +64,20 @@ module Fox
           end
         end
       end
+      # FIXME: The target objects stored in the accelerator table are currently
+      # private. Therefore FXRbAccelTable::markfunc() doesn't mark them as used.
+      # As a workaround the objects are additionally stored in @targets Hash.
+      @targets = {} unless instance_variable_defined?('@targets')
+      @targets[hotKey] = tgt
       addAccelOrig(hotKey, tgt, seldn, selup)
     end
+
+    alias removeAccelOrig removeAccel # :nodoc:
+
+    def removeAccel(hotKey)
+      @targets = {} unless instance_variable_defined?('@targets')
+      @targets.delete(hotKey)
+      removeAccelOrig(hotKey)
+    end
   end
 end

data/lib/fox16/bitmapview.rb

@@ -18,7 +18,7 @@ module Fox
   # +SEL_RIGHTBUTTONRELEASE+::	sent when the right mouse button goes up; the message data is an FXEvent instance.
   #
   class FXBitmapView < FXScrollArea
-  
+
     # Bitmap alignment styles
     BITMAPVIEW_NORMAL    = 0          # Normal mode is centered
     BITMAPVIEW_CENTER_X  = 0          # Centered horizontally
@@ -37,7 +37,7 @@ module Fox
       self.target = tgt
       self.message = sel
       @bitmap = bmp
-      @onColor = FXRGB(0, 0, 0)
+      @onColor = Fox.FXRGB(0, 0, 0)
       @offColor = backColor
       @grabx = 0
       @graby = 0
@@ -58,11 +58,11 @@ module Fox
     end
 
     def getContentWidth
-      bitmap.nil? 1 : bitmap.width
+      bitmap.nil? ? 1 : bitmap.width
     end
 
     def getContentHeight
-      bitmap.nil? 1 : bitmap.height
+      bitmap.nil? ? 1 : bitmap.height
     end
 
     def layout
@@ -121,10 +121,10 @@ module Fox
     # Handle right mouse button press
     def onRightBtnPress(sender, sel, ev)
       self.flags &= ~FLAG_TIP
-      handle(self, FXSEL(SEL_FOCUS_SELF, 0), ev)
+      handle(self, Fox.FXSEL(SEL_FOCUS_SELF, 0), ev)
       if enabled?
         grab
-        if target && target.handle(self, FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0
+        if target && target.handle(self, Fox.FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0
           return 1
         end
         self.flags &= ~FLAG_UPDATE
@@ -142,7 +142,7 @@ module Fox
         ungrab
         self.flags &= ~(FLAG_PRESSED|FLAG_SCROLLING)
         self.flags |= FLAG_UPDATE
-        if target && target.handle(self, FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0 
+        if target && target.handle(self, Fox.FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0
           return 1
         end
         return 1
@@ -220,4 +220,3 @@ module Fox
     end
   end
 end
-

data/lib/fox16/core.rb

@@ -203,11 +203,11 @@ module Fox
   end
 
   class FXScrollArea
-	  # Returns a reference to the scroll corner (an FXScrollCorner instance) for this window.
-	  def scrollCorner
-		  verticalScrollBar.next
-		end
-	end
+    # Returns a reference to the scroll corner (an FXScrollCorner instance) for this window.
+    def scrollCorner
+      verticalScrollBar.next
+    end
+  end
 
   class FXSettings
     #