fxruby 1.6.22.pre2 → 1.6.22.pre3

data/ext/fox16/include/FXRbTreeListVirtuals.h

@@ -10,7 +10,7 @@ public:
 
   // Overrides the base class version of extendSelection()
   virtual FXbool extendSelection(FXTreeItem* item,FXbool notify=FALSE);
-  
+
   // Overrides the base class version of killSelection()
   virtual FXbool killSelection(FXbool notify=FALSE);
 
@@ -28,15 +28,15 @@ public:
 
   // Overrides the base class version of setCurrentItem()
   virtual void setCurrentItem(FXTreeItem* item,FXbool notify=FALSE);
-  
+
   // Overrides the base class version of getItemAt()
   virtual FXTreeItem* getItemAt(FXint x,FXint y) const;
-  
+
   // Overrides the base class version of makeItemVisible()
   virtual void makeItemVisible(FXTreeItem* item);
 
   // Overrides the base class version of enableItem()
   virtual FXbool enableItem(FXTreeItem* item);
-  
+
   // Overrides the base class version of disableItem()
   virtual FXbool disableItem(FXTreeItem* item);

data/ext/fox16/include/FXRbWindow.h

@@ -149,7 +149,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,rb_intern("killFocus")); \
     } \
   void cls::changeFocus(FXWindow* child){ \
-    FXRbCallVoidMethod(this,rb_intern("changeFocus"),child); \
+    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,rb_intern("changeFocus"),child); \
     } \
   void cls::setDefault(FXbool enable){ \
     FXRbCallVoidMethod(this,rb_intern("setDefault"),enable); \
@@ -173,7 +173,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,rb_intern("position"),x,y,w,h); \
     } \
   void cls::recalc(){ \
-    FXRbCallVoidMethod(this,rb_intern("recalc")); \
+    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,rb_intern("recalc")); \
     } \
   void cls::reparent(FXWindow* father,FXWindow* other){ \
     FXRbCallVoidMethod(this,rb_intern("reparent"),father,other); \
@@ -232,7 +232,7 @@ public:
 
   // Another constructor
   FXRbWindow(FXApp* a,FXVisual *vis):FXWindow(a,vis){}
-  
+
   // Yet another constructor
   FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXWindow(a,own,opts,x,y,w,h){}
 

data/ext/fox16/include/FXRbWizard.h

@@ -47,10 +47,10 @@ public:
 
   /// Construct Wizard which will always float over the owner window
   FXRbWizard(FXWindow* owner,const FXString& name,FXImage *image,FXuint opts=DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=10,FXint pr=10,FXint pt=10,FXint pb=10,FXint hs=10,FXint vs=10) : FXWizard(owner,name,image,opts,x,y,w,h,pl,pr,pt,pb,hs,vs) {}
-  
+
   // Mark dependencies for the GC
   static void markfunc(FXWizard* self);
-  
+
   // Destructor
   virtual ~FXRbWizard(){
     FXRbUnregisterRubyObj(this);

data/ext/fox16/include/FXRuby.h

@@ -69,10 +69,12 @@ VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typ
     }
   return Qnil;
   }
-    
+
 // Wrapper around SWIG_Ruby_NewPointerObj()
 VALUE FXRbNewPointerObj(void *ptr, swig_type_info *typeinfo);
 bool FXRbIsBorrowed(void* ptr);
+bool FXRbSetInGC(const void* ptr, bool enabled);
+bool FXRbIsInGC(const void* ptr);
 
 // Wrapper around SWIG_TypeQuery()
 swig_type_info *FXRbTypeQuery(const char *name);
@@ -235,7 +237,7 @@ inline VALUE to_ruby(FXStream& store){
 inline VALUE to_ruby(const FXPoint* point){
   return FXRbNewPointerObj(static_cast<void*>(const_cast<FXPoint*>(point)),FXRbTypeQuery("FXPoint *"));
   }
- 
+
 inline VALUE to_ruby(const FXSegment* segment){
   return FXRbNewPointerObj(static_cast<void*>(const_cast<FXSegment*>(segment)),FXRbTypeQuery("FXSegment *"));
   }
@@ -304,7 +306,7 @@ inline FXID int_to_fxid(VALUE value){
 #ifndef WIN32
   return static_cast<FXID>(NUM2UINT(value));
 #else
-  return reinterpret_cast<FXID>(NUM2ULONG(value)); 
+  return reinterpret_cast<FXID>(NUM2ULONG(value));
 #endif
   }
 
@@ -322,6 +324,7 @@ template<class TYPE>
 void FXRbCallVoidMethod(FXObject* recv,ID func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,func,1,to_ruby(arg));
   }
 
@@ -331,11 +334,12 @@ void FXRbCallVoidMethod(FXDC* recv,ID func,TYPE arg){
   FXASSERT(!NIL_P(obj));
   rb_funcall(obj,func,1,to_ruby(arg));
   }
- 
+
 template<class TYPE>
 void FXRbCallVoidMethod(const FXObject* recv, ID func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,func,1,to_ruby(arg));
   }
 

data/ext/fox16/librb.c

@@ -15,8 +15,8 @@
 #define SWIG_TypePrettyName  SWIG_Ruby_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Ruby_TypeQuery
 #define SWIG_TypeClientData  SWIG_Ruby_TypeClientData
-#define SWIG_PackData        SWIG_Ruby_PackData 
-#define SWIG_UnpackData      SWIG_Ruby_UnpackData 
+#define SWIG_PackData        SWIG_Ruby_PackData
+#define SWIG_UnpackData      SWIG_Ruby_UnpackData
 
 /* Also rename all exported symbols from rubydef.swig */
 
@@ -55,7 +55,7 @@
  * Author : David Beazley (beazley@cs.uchicago.edu)
  *
  * Copyright (c) 1999-2000, The University of Chicago
- * 
+ *
  * This file may be freely redistributed without license or fee provided
  * this copyright message remains intact.
  ************************************************************************/
@@ -166,7 +166,7 @@ SWIG_TypeRegister(swig_type_info *ti) {
 }
 
 /* Check the typename */
-SWIGRUNTIME(swig_type_info *) 
+SWIGRUNTIME(swig_type_info *)
 SWIG_TypeCheck(char *c, swig_type_info *ty) {
   swig_type_info *s;
   if (!ty) return 0;        /* Void pointer */
@@ -192,14 +192,14 @@ SWIG_TypeCheck(char *c, swig_type_info *ty) {
 }
 
 /* Cast a pointer up an inheritance hierarchy */
-SWIGRUNTIME(void *) 
+SWIGRUNTIME(void *)
 SWIG_TypeCast(swig_type_info *ty, void *ptr) {
   if ((!ty) || (!ty->converter)) return ptr;
   return (*ty->converter)(ptr);
 }
 
 /* Dynamic pointer casting. Down an inheritance hierarchy */
-SWIGRUNTIME(swig_type_info *) 
+SWIGRUNTIME(swig_type_info *)
 SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
   swig_type_info *lastty = ty;
   if (!ty || !ty->dcast) return ty;
@@ -236,7 +236,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Compare two type names skipping the space characters, therefore
    "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -271,7 +271,7 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
   }
   return equiv;
 }
-  
+
 
 /* Search for a swig_type_info structure */
 SWIGRUNTIME(swig_type_info *)
@@ -405,7 +405,7 @@ SWIG_UnpackData(char *c, void *ptr, int sz) {
  * can be passed as an argument to API functions like Data_Wrap_Struct()
  * and Data_Make_Struct().
  */
- 
+
 #ifdef __cplusplus
 #  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
 #    define PROTECTFUNC(f) ((VALUE (*)()) f)
@@ -503,10 +503,10 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own)
     swig_class *sklass;
     VALUE klass;
     VALUE obj;
-    
+
     if (!ptr)
 	return Qnil;
-    
+
     if (type->clientdata) {
       sklass = (swig_class *) type->clientdata;
       obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr);
@@ -554,7 +554,7 @@ SWIG_Ruby_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags)
   } else {
     Data_Get_Struct(obj, void, *ptr);
   }
-  
+
   /* Do type-checking if type info was provided */
   if (ty) {
     if (ty->clientdata) {

data/ext/fox16/list_wrap.cpp

@@ -701,7 +701,7 @@ FXint FXList_setItem__SWIG_1(FXList *self,FXint index,FXString const &text,FXIco
 
       // Do the deed
       FXint result=self->setItem(index,text,icon,ITEMDATA,notify);
-      
+
       // Now zero-out pointers held by still-alive Ruby objects
       FXRbUnregisterRubyObj(oldItem);
 

data/ext/fox16/make_impl.rb

@@ -11,7 +11,7 @@ class Processor
     @inside_class
   end
 
-  def getBaseClassName(klass) 
+  def getBaseClassName(klass)
     klass.sub(/FXRb/, "FX")
   end
 
@@ -55,7 +55,7 @@ class MyProcessor < Processor
     @classname = nil
     @baseclass = nil
   end
-  
+
   def start_class(classname, baseclass)
     @classname = classname
     @baseclass = baseclass
@@ -66,7 +66,7 @@ class MyProcessor < Processor
     @fcpp.printf("/* Start stub implementations for class %s */\n", classname)
     @finc.printf("/* Start stub declarations for class %s */\n", classname)
   end
-  
+
   def implement_overrides(filename)
     stubclass = filename.gsub('"', '').sub("FXRb", "FX")
     stubclass = stubclass.sub(/Virtuals\.h/, "").upcase
@@ -76,7 +76,7 @@ class MyProcessor < Processor
       @fcpp.printf("IMPLEMENT_%s_STUBS(%s,%s)\n", stubclass, @classname, @baseclass)
     end
   end
-  
+
   def implement_stubs(filename)
     stubclass = filename.gsub('"', '').sub("FXRb", "FX")
     stubclass = stubclass.sub(/Virtuals\.h/, "").upcase
@@ -95,7 +95,7 @@ class MyProcessor < Processor
       implement_stubs(incfile)
     end
   end
-  
+
   def end_class
     if @classname == "FXRbScintilla"
       @fcpp.puts "\n#endif"