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

data/ext/fox16/FXRuby.cpp

@@ -85,11 +85,15 @@ static st_table * FXRuby_Objects;
  * struct. It identifies the Ruby instance associated with a C++ object.
  * It also indicates whether this is merely a "borrowed" reference to
  * some C++ object (i.e. it's not one we need to destroy later).
+ *
+ * in_gc is set for FXWindows that are in garbage collection and must
+ * not call ruby code anymore.
  */
 
 struct FXRubyObjDesc {
   VALUE obj;
   bool borrowed;
+  bool in_gc;
   };
 
 
@@ -108,9 +112,12 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
     FXRubyObjDesc *desc;
     if(FXMALLOC(&desc,FXRubyObjDesc,1)){
       obj=SWIG_Ruby_NewPointerObj(ptr,ty,1);
+      FXTRACE((1,"FXRbNewPointerObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(obj),ptr));
       desc->obj=obj;
       desc->borrowed=true;
-      st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t>(desc));
+      desc->in_gc=false;
+      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t>(desc));
+      FXASSERT(!overwritten);
       return obj;
       }
     else{
@@ -140,6 +147,25 @@ bool FXRbIsBorrowed(void* ptr){
     }
   }
 
+bool FXRbSetInGC(const void* ptr, bool enabled){
+  FXASSERT(ptr!=0);
+  FXRubyObjDesc *desc;
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    desc->in_gc=enabled;
+    return enabled;
+    }
+  return false;
+  }
+
+bool FXRbIsInGC(const void* ptr){
+  FXASSERT(ptr!=0);
+  FXRubyObjDesc *desc;
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
+    return desc->in_gc;
+    }
+  return false;
+  }
+
 
 /**
  * FXRbConvertPtr() is just a wrapper around SWIG_Ruby_ConvertPtr().
@@ -208,18 +234,34 @@ void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
   FXASSERT(foxObj!=0);
   FXRubyObjDesc* desc;
   FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(rubyObj),foxObj));
-  if(FXMALLOC(&desc,FXRubyObjDesc,1)){
+  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
+    FXASSERT(desc->borrowed);
+    /* There is already a Ruby object registered for this foxObj.
+     * This can happen, if libfox calls methods out of the C++ object constructor,
+     * that can be overwritten in Ruby (like changeFocus) with the object as
+     * parameter. FXFileSelector is one example.
+     * To avoid double references to the same foxObj from different Ruby objects,
+     * we decouple the foxObj from previoius ruby object and point to the new one.
+     */
+    DATA_PTR(desc->obj) = 0;
     desc->obj=rubyObj;
     desc->borrowed=false;
-    st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t>(desc));
     }
   else{
-    FXASSERT(FALSE);
+    if(FXMALLOC(&desc,FXRubyObjDesc,1)){
+      desc->obj=rubyObj;
+      desc->borrowed=false;
+      desc->in_gc=false;
+      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t>(desc));
+      FXASSERT(!overwritten);
+      }
+    else{
+      FXASSERT(FALSE);
+      }
     }
   FXASSERT(FXRbGetRubyObj(foxObj,false)==rubyObj);
   }
 
-
 /**
  * Remove this mapping between a Ruby instance and a C++ object
  */
@@ -1301,6 +1343,7 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
 void FXRbCallVoidMethod(FXObject* recv, ID func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
+  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,func,0,NULL);
   }
 

data/ext/fox16/core_wrap.cpp

@@ -712,7 +712,7 @@ static FXuint _MKUINT(FXushort l,FXushort h){
 static FXuint _FXSEL(FXushort type,FXushort id){
   return FXSEL(type,id);
   }
- 
+
 static FXushort _FXSELTYPE(FXuint s){
   return FXSELTYPE(s);
   }

data/ext/fox16/iconlist_wrap.cpp

@@ -703,7 +703,7 @@ FXint FXIconList_setItem__SWIG_1(FXIconList *self,FXint index,FXString const &te
 
       // Do the deed
       FXint result=self->setItem(index,text,big,mini,ITEMDATA,notify);
-      
+
       // Now zero-out pointers held by still-alive Ruby objects
       FXRbUnregisterRubyObj(oldItem);
 

data/ext/fox16/icons_wrap.cpp

@@ -1098,7 +1098,7 @@ static void free_FXXPMIcon(FXXPMIcon *);
     FXint width;
     FXint height;
     VALUE ary=Qnil;
-    
+
     // Confirm that the input is an array of strings
     Check_Type(strArray,T_ARRAY);
     len=RARRAY_LEN(strArray);

data/ext/fox16/include/FXMemoryBuffer.h

@@ -38,13 +38,13 @@ private:
 public:
   // Create an memory buffer object
   FXMemoryBuffer(FXColor *data,FXuint sz) : buffer(data),size(sz){}
-  
+
   // Returns a pointer to the data
   FXColor* getData() const { return buffer; }
-  
+
   // Returns the size (in bytes)
   FXuint getSize() const { return size; }
-  
+
   // Destructor
   ~FXMemoryBuffer(){}
   };

data/ext/fox16/include/FXRbApp.h

@@ -129,7 +129,7 @@ public:
 public:
   // Constructor
   FXRbApp(const FXchar* name,const FXchar* vendor);
-  
+
   // Construct and call init()
   static FXRbApp* constructAndInit(const FXchar* name,const FXchar* vendor);
 

data/ext/fox16/include/FXRbBitmap.h

@@ -103,7 +103,7 @@ inline void cls ## _setData(cls* self,FXuchar* pix,FXuint opts,FXint w,FXint h){
   void cls::setData(FXuchar* pix,FXuint opts,FXint w,FXint h){ \
     FXRbCallVoidMethod(this,rb_intern("setData"),pix,opts,w,h); \
     }
-  
+
 
 
 class FXRbBitmap : public FXBitmap {

data/ext/fox16/include/FXRbBitmapFrame.h

@@ -23,7 +23,7 @@
 /***********************************************************************
  * $Id: FXRbBitmapFrame.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
- 
+
 #ifndef FXRBBITMAPFRAME_H
 #define FXRBBITMAPFRAME_H
 
@@ -46,7 +46,7 @@ public:
 
   // Mark dependencies for the GC
   static void markfunc(FXBitmapFrame* self);
-  
+
   /// Destroy the widget, but do not destroy the bitmap
   virtual ~FXRbBitmapFrame(){
     FXRbUnregisterRubyObj(this);

data/ext/fox16/include/FXRbBitmapVirtuals.h

@@ -4,7 +4,7 @@ public:
 
   // Overrides the base class version of render()
   virtual void render();
-  
+
   // Overrides the base class version of release()
   virtual void release();
 
@@ -28,7 +28,7 @@ public:
 
   /// Fill bitmap with uniform value
   virtual void fill(FXbool color);
- 
+
   // Overrides the base class version of setData()
   virtual void setData(FXuchar *pix,FXuint opts=0);
 

data/ext/fox16/include/FXRbDCPrint.h

@@ -45,5 +45,5 @@ public:
     FXRbUnregisterAppSensitiveObject(this);
     }
   };
-  
+
 #endif

data/ext/fox16/include/FXRbDCVirtuals.h

@@ -22,7 +22,7 @@ public:
 
   // Overrides the base class version of drawLineSegments()
   virtual void drawLineSegments(const FXSegment* segments,FXuint nsegments);
-  
+
   // Overrides the base class version of drawRectangle()
   virtual void drawRectangle(FXint x,FXint y,FXint w,FXint h);
 
@@ -85,10 +85,10 @@ public:
 
   // Overrides the base class version of drawHashBox()
   virtual void drawHashBox(FXint x,FXint y,FXint w,FXint h,FXint b=1);
-  
+
   // Overrides the base class version of drawFocusRectangle()
   virtual void drawFocusRectangle(FXint x,FXint y,FXint w,FXint h);
-  
+
   // Overrides the base class version of drawArea()
   virtual void drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy);
 
@@ -100,7 +100,7 @@ public:
 
   // Overrides the base class version of drawBitmap()
   virtual void drawBitmap(const FXBitmap* bitmap,FXint dx,FXint dy);
-  
+
   // Overrides the base class version of drawIcon()
   virtual void drawIcon(const FXIcon* icon,FXint dx,FXint dy);
 
@@ -124,64 +124,64 @@ public:
 
   // Overrides the base class version of setForeground()
   virtual void setForeground(FXColor clr);
-  
+
   // Overrides the base class version of setBackground()
   virtual void setBackground(FXColor clr);
-  
+
   // Overrides the base class version of setDashes()
   virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
-  
+
   // Overrides the base class version of setLineWidth()
   virtual void setLineWidth(FXuint linewidth=0);
-  
+
   // Overrides the base class version of setLineCap()
   virtual void setLineCap(FXCapStyle capstyle=CAP_BUTT);
-  
+
   // Overrides the base class version of setLineJoin()
   virtual void setLineJoin(FXJoinStyle joinstyle=JOIN_MITER);
-  
+
   // Overrides the base class version of setLineStyle()
   virtual void setLineStyle(FXLineStyle linestyle=LINE_SOLID);
-  
+
   // Overrides the base class version of setFillStyle()
   virtual void setFillStyle(FXFillStyle fillstyle=FILL_SOLID);
-  
+
   // Overrides the base class version of setFillRule()
   virtual void setFillRule(FXFillRule fillrule=RULE_EVEN_ODD);
-  
+
   // Overrides the base class version of setFunction()
   virtual void setFunction(FXFunction func=BLT_SRC);
-  
+
   // Overrides the base class version of setTile()
   virtual void setTile(FXImage* image,FXint dx=0,FXint dy=0);
-  
+
   // Overrides the base class version of setStipple()
   virtual void setStipple(FXBitmap *bitmap,FXint dx=0,FXint dy=0);
-  
+
   // Overrides the base class version of setStipple()
   virtual void setStipple(FXStipplePattern pat,FXint dx=0,FXint dy=0);
-  
+
   // Overrides the base class version of setClipRegion()
   virtual void setClipRegion(const FXRegion& region);
-  
+
   // Overrides the base class version of setClipRectangle()
   virtual void setClipRectangle(FXint x,FXint y,FXint w,FXint h);
-  
+
   // Overrides the base class version of setClipRectangle()
   virtual void setClipRectangle(const FXRectangle& rectangle);
-  
+
   // Overrides the base class version of clearClipRectangle()
   virtual void clearClipRectangle();
-  
+
   // Overrides the base class version of setClipMask()
   virtual void setClipMask(FXBitmap* bitmap,FXint dx=0,FXint dy=0);
-  
+
   // Overrides the base class version of clearClipMask()
   virtual void clearClipMask();
-  
+
   // Overrides the base class version of setFont()
   virtual void setFont(FXFont *fnt);
-  
+
   // Overrides the base class version of clipChildren()
   virtual void clipChildren(FXbool yes);
 

data/ext/fox16/include/FXRbDCWindow.h

@@ -36,7 +36,7 @@ public:
     FXRbRegisterAppSensitiveObject(this);
     }
 
-  /// Construct for normal drawing; 
+  /// Construct for normal drawing;
   /// This sets clip rectangle to the whole drawable
   FXRbDCWindow(FXDrawable* drawable) : FXDCWindow(drawable){
     FXRbRegisterAppSensitiveObject(this);

data/ext/fox16/include/FXRbDockBar.h

@@ -61,7 +61,7 @@ protected:
 #include "FXRbDockBarVirtuals.h"
 public:
   /**
-  * Construct a floatable Dockbar 
+  * Construct a floatable Dockbar
   * Normally, the Dockbar is docked under window p.
   * When floated, the Dockbar can be docked under window q, which is
   * typically an FXToolBarShell window.

data/ext/fox16/include/FXRbFileDict.h

@@ -70,7 +70,7 @@ inline FXFileAssoc* klass ## _findExecBinding(klass* self,const FXchar* pathname
     return FXRbCallFileAssocMethod(this,rb_intern("findExecBinding"),pathname); \
     }
 
-    
+
 /// File Association dictionary
 class FXRbFileDict : public FXFileDict {
   FXDECLARE(FXRbFileDict)
@@ -99,6 +99,6 @@ public:
     FXRbUnregisterRubyObj(this);
     }
   };
-  
+
 
 #endif

data/ext/fox16/include/FXRbFoldingList.h

@@ -259,7 +259,7 @@ public:
   // Enumerate items
   static void enumerateItem(FXFoldingItem* item,FXObjectListOf<FXFoldingItem>& items);
   static void enumerateItems(FXFoldingItem* fm,FXFoldingItem* to,FXObjectListOf<FXFoldingItem>& items);
-  
+
   // Destructor
   virtual ~FXRbFoldingList(){
     FXRbFoldingList::unregisterOwnedObjects(this);

data/ext/fox16/include/FXRbFontVirtuals.h

@@ -10,37 +10,37 @@ public:
 
   // Overrides the base class version of isFontMono()
   virtual FXbool isFontMono() const;
-  
+
   // Overrides the base class version of hasChar()
   virtual FXbool hasChar(FXwchar ch) const;
 
   // Overrides the base class version of getMinChar()
   virtual FXwchar getMinChar() const;
-  
+
   // Overrides the base class version of getMaxChar()
   virtual FXwchar getMaxChar() const;
 
   // Overrides the base class version of leftBearing()
   virtual FXint leftBearing(FXwchar ch) const;
-  
+
   // Overrides the base class version of rightBearing()
   virtual FXint rightBearing(FXwchar ch) const;
-  
+
   // Overrides the base class version of getFontWidth()
   virtual FXint getFontWidth() const;
-  
+
   // Overrides the base class version of getFontHeight()
   virtual FXint getFontHeight() const;
-  
+
   // Overrides the base class version of getFontAscent()
   virtual FXint getFontAscent() const;
-  
+
   // Overrides the base class version of getFontDescent()
   virtual FXint getFontDescent() const;
-  
+
   // Overrides the base class version of getFontLeading()
   virtual FXint getFontLeading() const;
-  
+
   // Overrides the base class version of getFontSpacing()
   virtual FXint getFontSpacing() const;
 

data/ext/fox16/include/FXRbGLViewerVirtuals.h

@@ -1,10 +1,10 @@
 public:
   // Overrides the base class version of select()
   virtual FXGLObject** select(FXint x,FXint y,FXint w,FXint h);
-  
+
   // Overrides the base class version of pick()
   virtual FXGLObject* pick(FXint x,FXint y);
-  
+
   // Overrides the base class version of setBounds()
   virtual FXbool setBounds(const FXRangef& box);
 

data/ext/fox16/include/FXRbIconItemVirtuals.h

@@ -1,32 +1,32 @@
 protected:
   // Overrides the base class version of draw()
   virtual void draw(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Overrides the base class version of hitItem()
   virtual FXint hitItem(const FXIconList* list,FXint rx,FXint ry,FXint rw=1,FXint rh=1) const;
-  
+
   // Overrides the base class version of drawBigIcon()
   virtual void drawBigIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Overrides the base class version of drawMiniIcon()
   virtual void drawMiniIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Overrides the base class version of drawDetails()
   virtual void drawDetails(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
 
 public:
   // Publically accessible version of draw()
   void public_draw(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Publically accessible version of hitItem()
   FXint public_hitItem(const FXIconList* list,FXint rx,FXint ry,FXint rw=1,FXint rh=1) const;
-  
+
   // Publically accessible version of drawBigIcon()
   void public_drawBigIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Publically accessible version of drawMiniIcon()
   void public_drawMiniIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  
+
   // Publically accessible version of drawDetails()
    void public_drawDetails(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;