fxruby 1.2.3 → 1.2.4

data/ext/fox12/core_wrap.cpp

@@ -747,6 +747,18 @@ static void free_FXFileStream(FXFileStream *);
 FXMemoryStream *new_FXMemoryStream(FXObject const *cont){
       return new FXRbMemoryStream(cont);
       }
+FXbool FXMemoryStream_open(FXMemoryStream *self,FXStreamDirection save_or_load,VALUE str){
+      unsigned long size=0;
+      FXuchar *data=0;
+      if(!NIL_P(str)){
+        size=RSTRING(str)->len;
+        data=reinterpret_cast<FXuchar*>(STR2CSTR(str));
+        return self->open(save_or_load,size,data);
+        }
+      else{
+        return self->open(save_or_load,data);
+        }
+      }
 VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
       FXuchar* buffer;
       unsigned long sp;
@@ -754,7 +766,7 @@ VALUE FXMemoryStream_takeBuffer(FXMemoryStream *self){
       VALUE result=rb_str_new(const_cast<const char *>(reinterpret_cast<char*>(buffer)),sp);
       FXFREE(&buffer);
       return result;
-    }
+      }
 void FXMemoryStream_giveBuffer(FXMemoryStream *self,VALUE str){
       Check_Type(str,T_STRING);
       FXuchar* buffer=reinterpret_cast<FXuchar*>(StringValuePtr(str));
@@ -2069,32 +2081,12 @@ static VALUE _wrap_new_FXMemoryStream(int argc, VALUE *argv, VALUE self) { FXObj
     if (argc > 0) { SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXObject, 1); }  {
         result = (FXMemoryStream *)new_FXMemoryStream((FXObject const *)arg1);
         DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
-static VALUE _wrap_FXMemoryStream_open__SWIG_0(int argc, VALUE *argv, VALUE self) {
-    FXMemoryStream *arg1 = (FXMemoryStream *) 0 ; int arg2 ; FXuchar *arg3 = (FXuchar *) 0 ; FXbool result;
-    VALUE vresult = Qnil; if ((argc < 2) || (argc > 2)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); arg2 = (int) NUM2INT(argv[0]);
-    arg3 = NIL_P(argv[1]) ? 0 : reinterpret_cast<FXuchar*>(STR2CSTR(argv[1]));
-    result = (FXbool)(arg1)->open((FXStreamDirection )arg2,arg3); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXMemoryStream_open__SWIG_1(int argc, VALUE *argv, VALUE self) {
-    FXMemoryStream *arg1 = (FXMemoryStream *) 0 ; int arg2 ; unsigned long arg3 ; FXuchar *arg4 = (FXuchar *) 0 ; FXbool result;
-    VALUE vresult = Qnil; if ((argc < 3) || (argc > 3)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); arg2 = (int) NUM2INT(argv[0]);
-    arg3 = NUM2ULONG(argv[1]); arg4 = NIL_P(argv[2]) ? 0 : reinterpret_cast<FXuchar*>(STR2CSTR(argv[2]));
-    result = (FXbool)(arg1)->open((FXStreamDirection )arg2,arg3,arg4); vresult = result ? Qtrue : Qfalse; return vresult; }
-static VALUE _wrap_FXMemoryStream_open(int nargs, VALUE *args, VALUE self) { int argc; VALUE argv[5]; int ii; argc = nargs + 1;
-    argv[0] = self; for (ii = 1; (ii < argc) && (ii < 4); ii++) { argv[ii] = args[ii-1]; }  if (argc == 3) { int _v; {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0; }
-         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
-                    _v = (NIL_P(argv[2]) || TYPE(argv[2]) == T_STRING) ? 1 : 0; }  if (_v) {
-                    return _wrap_FXMemoryStream_open__SWIG_0(nargs, args, self);}  }  }  }  if (argc == 4) { int _v; {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_FXMemoryStream, 0) != -1)) ? 1 : 0; }
-         if (_v) { { _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
-                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0; }  if (_v) { {
-                        _v = (NIL_P(argv[3]) || TYPE(argv[3]) == T_STRING) ? 1 : 0; }  if (_v) {
-                        return _wrap_FXMemoryStream_open__SWIG_1(nargs, args, self);}  }  }  }  } 
-    rb_raise(rb_eArgError, "No matching function for overloaded 'FXMemoryStream_open'"); return Qnil; }
+static VALUE _wrap_FXMemoryStream_open(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
+    int arg2 ; VALUE arg3 ; FXbool result; VALUE vresult = Qnil; if ((argc < 2) || (argc > 2))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryStream, 1); arg2 = (int) NUM2INT(argv[0]); arg3 = argv[1];
+    result = (FXbool)FXMemoryStream_open(arg1,(FXStreamDirection )arg2,arg3); vresult = result ? Qtrue : Qfalse;
+    return vresult; }
 static VALUE _wrap_FXMemoryStream_takeBuffer(int argc, VALUE *argv, VALUE self) { FXMemoryStream *arg1 = (FXMemoryStream *) 0 ;
     VALUE result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);

data/ext/fox12/image_wrap.cpp

@@ -608,6 +608,19 @@ FXBitmap *new_FXBitmap(FXApp *a,void const *pix,FXuint opts,FXint w,FXint h){
 
 swig_class cFXBitmap;
 static void free_FXBitmap(FXBitmap *);
+VALUE FXMemoryBuffer_getData(FXMemoryBuffer const *self){
+      FXColor* data = self->getData();
+      if (data) {
+        FXuint size = self->getSize();
+        VALUE ary = rb_ary_new2(size);
+        for (int i = 0; i < size; i++)
+          rb_ary_store(ary, i, UINT2NUM(data[i]));
+        return ary;
+        }
+      else {
+        return Qnil;
+        }
+      }
 FXColor FXMemoryBuffer___getitem__(FXMemoryBuffer const *self,FXuint i){
       return self->getData()[i];
       }
@@ -618,8 +631,18 @@ FXColor FXMemoryBuffer___setitem__(FXMemoryBuffer *self,FXuint i,FXColor value){
 
 swig_class cFXMemoryBuffer;
 static void free_FXMemoryBuffer(FXMemoryBuffer *);
-FXImage *new_FXImage(FXApp *a,FXColor const *PIXELS,FXuint opts,FXint w,FXint h){
-      return new FXRbImage(a,PIXELS,opts,w,h);
+FXImage *new_FXImage(FXApp *a,VALUE ary,FXuint opts,FXint w,FXint h){
+      FXColor* pix=0;
+      if(!NIL_P(ary)){
+        Check_Type(ary,T_ARRAY);
+        if(FXMALLOC(&pix,FXColor,RARRAY(ary)->len)){
+          for(long i=0; i<RARRAY(ary)->len; i++){
+            pix[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(ary,i)));
+	    }
+          }
+	  opts&=IMAGE_OWNED;
+        }
+      return new FXRbImage(a,pix,opts,w,h);
       }
 FXMemoryBuffer *FXImage_getData(FXImage const *self){
       if(self->getData()){
@@ -1008,11 +1031,32 @@ static VALUE _wrap_FXBitmap_fill(int argc, VALUE *argv, VALUE self) { FXBitmap *
     if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXBitmap, 1); arg2 = to_FXbool(argv[0]); FXBitmap_fill(arg1,arg2);
     return Qnil; }
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+static VALUE _wrap_FXMemoryBuffer_allocate(VALUE self) {
+#else
+     static VALUE _wrap_FXMemoryBuffer_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+         VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMemoryBuffer);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+        rb_obj_call_init(vresult, argc, argv);
+#endif
+         return vresult; }
+static VALUE _wrap_new_FXMemoryBuffer(int argc, VALUE *argv, VALUE self) { FXColor *arg1 = (FXColor *) 0 ; FXuint arg2 ;
+    FXMemoryBuffer *result; if ((argc < 1) || (argc > 1)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); {
+        Check_Type(argv[0], T_ARRAY); FXMALLOC(&arg1,FXColor,RARRAY(argv[0])->len);
+        arg2=static_cast<FXuint>(RARRAY(argv[0])->len); for(FXint i=0; i<arg2; i++){
+            arg1[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[0],i))); }  } 
+    result = (FXMemoryBuffer *)new FXMemoryBuffer(arg1,arg2); DATA_PTR(self) = result; { FXFREE(&arg1); }  return self; }
 static VALUE _wrap_FXMemoryBuffer_getSize(int argc, VALUE *argv, VALUE self) { FXMemoryBuffer *arg1 = (FXMemoryBuffer *) 0 ;
     FXuint result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryBuffer, 1);
     result = (FXuint)((FXMemoryBuffer const *)arg1)->getSize(); vresult = UINT2NUM(result); return vresult; }
+static VALUE _wrap_FXMemoryBuffer_getData(int argc, VALUE *argv, VALUE self) { FXMemoryBuffer *arg1 = (FXMemoryBuffer *) 0 ;
+    VALUE result; VALUE vresult = Qnil; if ((argc < 0) || (argc > 0))
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXMemoryBuffer, 1);
+    result = (VALUE)FXMemoryBuffer_getData((FXMemoryBuffer const *)arg1); vresult = result; return vresult; }
 static VALUE _wrap_FXMemoryBuffer___getitem__(int argc, VALUE *argv, VALUE self) { FXMemoryBuffer *arg1 = (FXMemoryBuffer *) 0 ;
     FXuint arg2 ; FXColor result; VALUE vresult = Qnil; if ((argc < 1) || (argc > 1))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
@@ -1038,17 +1082,13 @@ static VALUE _wrap_FXImage_allocate(VALUE self) {
         rb_obj_call_init(vresult, argc, argv);
 #endif
          return vresult; }
-static VALUE _wrap_new_FXImage(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; FXColor *arg2 = (FXColor *) 0 ;
+static VALUE _wrap_new_FXImage(int argc, VALUE *argv, VALUE self) { FXApp *arg1 = (FXApp *) 0 ; VALUE arg2 = (VALUE) Qnil ;
     FXuint arg3 = (FXuint) 0 ; FXint arg4 = (FXint) 1 ; FXint arg5 = (FXint) 1 ; FXImage *result; if ((argc < 1) || (argc > 5))
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { { arg2=NULL; if(argv[1]!=Qnil){
-                Check_Type(argv[1],T_ARRAY); if(FXMALLOC(&arg2,FXColor,RARRAY(argv[1])->len)){
-                    for(long i=0; i<RARRAY(argv[1])->len; i++){
-                        arg2[i]=static_cast<FXColor>(NUM2UINT(rb_ary_entry(argv[1],i))); }  }  }  }  }  if (argc > 2) {
+    SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_FXApp, 1); if (argc > 1) { arg2 = argv[1]; }  if (argc > 2) {
         arg3 = NUM2UINT(argv[2]); }  if (argc > 3) { arg4 = NUM2INT(argv[3]); }  if (argc > 4) { arg5 = NUM2INT(argv[4]); }  {
-        result = (FXImage *)new_FXImage(arg1,(FXColor const *)arg2,arg3,arg4,arg5);
-        DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result); if(rb_block_given_p()){ rb_yield(self); }  }  FXFREE(&arg2);
-    return self; }
+        result = (FXImage *)new_FXImage(arg1,arg2,arg3,arg4,arg5); DATA_PTR(self) = result; FXRbRegisterRubyObj(self, result);
+        if(rb_block_given_p()){ rb_yield(self); }  }  return self; }
 static VALUE _wrap_FXImage_getData(int argc, VALUE *argv, VALUE self) { FXImage *arg1 = (FXImage *) 0 ; FXMemoryBuffer *result;
     VALUE vresult = Qnil; if ((argc < 0) || (argc > 0)) rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
     SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_FXImage, 1);
@@ -3603,8 +3643,10 @@ SWIGEXPORT(void) Init_image(void) {
     
     cFXMemoryBuffer.klass = rb_define_class_under(mFox, "FXMemoryBuffer", rb_cObject);
     SWIG_TypeClientData(SWIGTYPE_p_FXMemoryBuffer, (void *) &cFXMemoryBuffer);
-    rb_undef_alloc_func(cFXMemoryBuffer.klass);
+    rb_define_alloc_func(cFXMemoryBuffer.klass, _wrap_FXMemoryBuffer_allocate);
+    rb_define_method(cFXMemoryBuffer.klass, "initialize", VALUEFUNC(_wrap_new_FXMemoryBuffer), -1);
     rb_define_method(cFXMemoryBuffer.klass, "getSize", VALUEFUNC(_wrap_FXMemoryBuffer_getSize), -1);
+    rb_define_method(cFXMemoryBuffer.klass, "getData", VALUEFUNC(_wrap_FXMemoryBuffer_getData), -1);
     rb_define_method(cFXMemoryBuffer.klass, "[]", VALUEFUNC(_wrap_FXMemoryBuffer___getitem__), -1);
     rb_define_method(cFXMemoryBuffer.klass, "[]=", VALUEFUNC(_wrap_FXMemoryBuffer___setitem__), -1);
     cFXMemoryBuffer.mark = 0;

data/ext/fox12/include/FXRbApp.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbApp.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbApp.h,v 1.2 2005/02/05 17:34:32 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBAPP_H
@@ -43,7 +43,7 @@ static void cls ## _init(cls* self,VALUE ary,FXbool connect){ \
   char **argv; \
   int argc=1+RARRAY(ary)->len; \
   if(FXMALLOC(&argv,char*,argc+1)){ \
-    argv[0]=NULL; \
+    argv[0]="foo"; \
     for(i=1;i<argc;i++){ \
       argv[i]=STR2CSTR(RSTRING(rb_ary_entry(ary,i-1))); \
       } \
@@ -55,7 +55,6 @@ static void cls ## _init(cls* self,VALUE ary,FXbool connect){ \
     for(i=1;i<argc;i++){ \
       rb_ary_push(ary,rb_str_new2(argv[i])); \
       } \
-    FXFREE(&argv); \
     } \
   } \
 inline void cls ## _exit(cls *self,FXint code){ \
@@ -63,6 +62,24 @@ inline void cls ## _exit(cls *self,FXint code){ \
   }
 
 
+/**
+ * For C/C++ applications, the argument count (argc) will always be at least
+ * one, and the first element of the argument array (argv[0]) will contain
+ * the program name. So if you type something like this:
+ *
+ *     myprogram one two three
+ *
+ * then argc will be four (4) and argv will contain "myprogram", "one",
+ * "two" and "three".
+ *
+ * For Ruby applications, the size and contents of the argument array (ARGV)
+ * just correspond to the application arguments; so if you type something like
+ * this:
+ *
+ *     ruby myprogram.rb one two three
+ *
+ * then the ARGV will have three elements ("one", "two" and "three").
+ */
 #define IMPLEMENT_FXAPP_STUBS(cls) \
   void cls::create(){ \
     FXRbCallVoidMethod(this,rb_intern("create")); \

data/ext/fox12/include/FXRbScrollArea.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbScrollArea.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbScrollArea.h,v 1.2 2005/02/22 14:47:14 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBSCROLLAREA_H
@@ -75,6 +75,9 @@ public:
 
   // Destructor
   virtual ~FXRbScrollArea(){
+    FXRbUnregisterRubyObj(horizontal);
+    FXRbUnregisterRubyObj(vertical);
+    FXRbUnregisterRubyObj(corner);
     FXRbUnregisterRubyObj(this);
     }
   };

data/ext/fox12/include/FXRbScrollWindow.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbScrollWindow.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbScrollWindow.h,v 1.2 2005/02/22 14:47:14 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBSCROLLWINDOW_H
@@ -42,6 +42,9 @@ public:
 
   // Destructor
   virtual ~FXRbScrollWindow(){
+    FXRbUnregisterRubyObj(horizontal);
+    FXRbUnregisterRubyObj(vertical);
+    FXRbUnregisterRubyObj(corner);
     FXRbUnregisterRubyObj(this);
     }
 

data/ext/fox12/include/FXRbTable.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbTable.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbTable.h,v 1.3 2005/02/22 14:50:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBTABLE_H
@@ -410,6 +410,11 @@ public:
   // Destructor
   virtual ~FXRbTable(){
     FXRbUnregisterRubyObj(this);
+    for(FXint r=0; r<getNumRows(); r++){
+      for(FXint c=0; c<getNumColumns(); c++){
+	FXRbUnregisterRubyObj(getItem(r,c));
+        }
+      }
     }
   };
 

data/lib/fox12/aliases.rb

@@ -2726,6 +2726,8 @@ module Fox
   end
   class FXMemoryBuffer
     alias size getSize
+    alias data getData
+    alias to_a getData
   end
   class FXMemoryStream
     alias space  getSpace

data/lib/fox12/core.rb

@@ -66,6 +66,13 @@ module Fox
     end
   end
 
+  class FXScrollArea
+	  # Returns a reference to the scroll corner (an FXScrollCorner instance) for this window.
+	  def scrollCorner
+		  verticalScrollBar.next
+		end
+	end
+
   class FXSettings
     #
     # Read a boolean registry entry from the specified _section_ and _key_.
@@ -245,5 +252,25 @@ module Fox
       self
     end
   end
+  
+  class FXTable
+    #
+    # Append _numColumns_ columns to the right of the table..
+    # If _notify_ is +true+, a <tt>SEL_INSERTED</tt> message is sent to the
+    # table�s message target for each cell that is inserted.
+    #
+    def appendColumns(numColumns=1, notify=false)
+      insertColumns(self.numColumns, numColumns, notify)
+    end
+    
+    #
+    # Append _numRows_ rows to the bottom of the table..
+    # If _notify_ is +true+, a <tt>SEL_INSERTED</tt> message is sent to the
+    # table�s message target for each cell that is inserted.
+    #
+    def appendRows(numRows=1, notify=false)
+      insertRows(self.numRows, numRows, notify)
+    end
+  end
 end
 

data/lib/fox12/splashscreen.rb

@@ -58,7 +58,7 @@ module Fox
 end
 
 if $0 == __FILE__
-  class FakeSite
+  class FakeSite # :nodoc:
     def open( &status )
       yield ">>>>> Opening Site" if block_given?
       sleep 5

data/lib/fox12/version.rb

@@ -5,7 +5,7 @@ module Fox
   # Returns the FXRuby version number as a string, e.g. "1.0.19".
   #
   def Fox.fxrubyversion
-    "1.2.3"
+    "1.2.4"
   end
 end
 

data/rdoc-sources/FXAccelTable.rb

@@ -13,11 +13,11 @@ module Fox
 
     #
     # Add an accelerator to the table. The _hotKey_ is a code returned
-    # by the Fox.fxparseaccel method. For example, to associate the
+    # by the Fox.fxparseAccel method. For example, to associate the
     # Ctrl+S keypress with sending a "save" command to a document, you
     # might use code like this:
     #
-    #   hotKey = fxparseaccel("Ctrl+S")
+    #   hotKey = fxparseAccel("Ctrl+S")
     #   accelTable.addAccel(hotKey, doc, FXSEL(SEL_COMMAND, MyDocument::ID_SAVE))
     #
     # ==== Parameters:
@@ -37,9 +37,9 @@ module Fox
     #
     # Return +true+ if accelerator specified.
     # Here, _hotKey_ is a code representing an accelerator key as returned
-    # by the Fox.fxparseaccel method. For example,
+    # by the Fox.fxparseAccel method. For example,
     #
-    #   if accelTable.hasAccel?(fxparseaccel("Ctrl+S"))
+    #   if accelTable.hasAccel?(fxparseAccel("Ctrl+S"))
     #     ...
     #   end
     #
@@ -49,18 +49,18 @@ module Fox
     # Return the target object of the given accelerator, or +nil+ if
     # the accelerator is not present in this accelerator table.
     # Here, _hotKey_ is a code representing an accelerator key as returned
-    # by the Fox.fxparseaccel method. For example,
+    # by the Fox.fxparseAccel method. For example,
     #
-    #   doc = accelTable.targetofAccel(fxparseaccel("Ctrl+S"))
+    #   doc = accelTable.targetofAccel(fxparseAccel("Ctrl+S"))
     #
     def targetOfAccel(hotKey) ; end
   
     #
     # Remove mapping for specified hot key.
     # Here, _hotKey_ is a code representing an accelerator key as returned
-    # by the Fox.fxparseaccel method. For example,
+    # by the Fox.fxparseAccel method. For example,
     #
-    #   accelTable.removeAccel(fxparseaccel("Ctrl+S"))
+    #   accelTable.removeAccel(fxparseAccel("Ctrl+S"))
     #
     def removeAccel(hotKey) ; end
   end

data/rdoc-sources/FXImage.rb

@@ -56,11 +56,10 @@ module Fox
     # large images to instruct #render to use shared memory to communicate
     # with the server.
     #
-    #
     # ==== Parameters:
     #
     # +a+::		an application instance [FXApp]
-    # +pixels+::	pixels [String or FXMemoryBuffer]
+    # +pixels+::	pixels [Array of FXColor values]
     # +opts+::		image options [Integer]
     # +w+::		image width [Integer]
     # +h+::		image height [Integer]
@@ -94,16 +93,23 @@ module Fox
 
     #
     # Restore client-side pixel buffer from image.
+    # This operation overwrites any current values for the client-side
+    # pixel buffer with values corresponding to the server-side image.
+    # If the image data is +nil+ at the time #restore is called, the
+    # image will first allocate an (owned) pixel buffer to use for this
+    # operation.
     #
     def restore() ; end
 
     #
-    # Render the image from client-side pixel buffer.
+    # Render the image from client-side pixel buffer, if there is data
+    # and if the image width and height are greater than zero.
     #
     def render() ; end
   
     #
-    # Release the client-side pixels buffer, free it if it was owned.
+    # Release the client-side pixels buffer, free it if it was owned
+    # (i.e. if the +IMAGE_OWNED+ option is set)..
     # If it is not owned, the image just forgets about the buffer.
     #
     def release(); end

data/rdoc-sources/FXMemoryBuffer.rb

@@ -1,9 +1,6 @@
 module Fox
   class FXMemoryBuffer
 
-    # Pixel buffer, an array of FXColor values [Array]
-    attr_reader :data
-
     #
     # Return a new FXMemoryBuffer instance, initialized with the
     # provided array of FXColor values.
@@ -12,7 +9,14 @@ module Fox
     #
     # +data+::	the initial array of FXColor values.
     #
-    def initialize(data, size); end
+    def initialize(data); end
+
+    # Return a copy of the pixel buffer, as an array of FXColor values [Array]
+    def data; end
+    alias to_a data
+
+    # Return the size of the pixel buffer
+    def size; end
 
     # Return the specified element (an FXColor value)
     def [](index); end